Greg Kroah-Hartman e9563355ac Staging: Merge staging-next into Linus's tree ... Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-08-05 14:18:03 -07:00
..
alpha
arm	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
avr32	serial: fix rs485 for atmel_serial on avr32	2010-07-26 11:59:31 -07:00
blackfin
cris
frv
h8300
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2010-08-05 08:57:50 -07:00
m32r
m68k
m68knommu
microblaze	Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze	2010-08-05 08:59:22 -07:00
mips	MIPS: PowerTV: Separate PowerTV USB support from non-USB code	2010-08-05 13:26:34 +01:00
mn10300
parisc	parisc: pass through '\t' to early (iodc) console	2010-08-04 11:17:10 -07:00
powerpc	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-08-05 09:03:46 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2010-08-04 15:23:14 -07:00
score
sh	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2010-08-05 08:58:30 -07:00
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
x86	Staging: Merge staging-next into Linus's tree	2010-08-05 14:18:03 -07:00
xtensa	Merge remote branch 'origin/master'	2010-08-03 00:38:00 -07:00
.gitignore
Kconfig