Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
alpha	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
arm	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
avr32	driver-core: remove sysdev.h usage.	2011-12-21 16:26:03 -08:00
blackfin	blackfin: Fixup export.h includes	2011-11-14 17:15:23 +08:00
cris	net: Fix references to deleted NET_ETHERNET Kconfig setting.	2011-11-09 19:26:53 -05:00
frv	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
h8300	Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6	2011-10-29 07:27:45 -07:00
hexagon	Hexagon: Add basic stacktrace functionality for Hexagon architecture.	2011-11-01 07:34:21 -07:00
ia64	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
m32r	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
m68k	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
microblaze	microblaze: bury asm/namei.h	2011-11-21 16:48:28 -05:00
mips	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
mn10300	kgdb: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
openrisc	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
parisc	parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE	2011-10-31 19:31:00 -04:00
powerpc	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
s390	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
score	score: drop unused Kconfig symbols	2011-10-31 23:39:51 +01:00
sh	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
sparc	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
tile	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
um	Merge branch 'for-linus' of git://github.com/richardweinberger/linux	2011-11-02 09:45:39 -07:00
unicore32	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
x86	Merge branch 'driver-core-next' into Linux 3.2	2012-01-06 11:42:52 -08:00
xtensa	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2011-10-26 17:15:03 +02:00
.gitignore
Kconfig