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
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
procfs: do not confuse jiffies with cputime64_t
2011-12-29 16:31:57 -08:00
drm/radeon/kms: add some new pci ids
2011-12-14 12:29:03 +00:00
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2011-12-20 10:49:39 -08:00
ipvs: try also real server with port 0 in backup server
2011-12-31 16:06:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-11-01 10:51:38 -07:00
[SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority
2011-12-15 11:02:07 +04:00
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
target: remove the unused se_dev_list
2011-12-06 06:00:57 +00:00
writeback: show writeback reason with __print_symbolic
2011-12-18 14:20:17 +08:00
ARM: OMAP: HWMOD: Unify DSS resets for OMAPs
2011-11-08 03:16:13 -07:00
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
ff4b8a57f0