Arnd Bergmann 928a11ba36 Merge branch 'next/cleanup' into samsung/dt ... Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:23:00 +00:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2011-11-07 10:13:52 -08:00
asm-generic	procfs: do not confuse jiffies with cputime64_t	2011-12-29 16:31:57 -08:00
crypto	crypto: Add a report function pointer to crypto_type	2011-10-21 14:24:03 +02:00
drm	drm/radeon/kms: add some new pci ids	2011-12-14 12:29:03 +00:00
keys
linux	Merge branch 'next/cleanup' into samsung/dt	2012-01-07 20:23:00 +00:00
math-emu
media	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
misc	[media] altera-stapl: it is time to move out from staging	2011-09-23 15:00:57 -03:00
mtd
net	ipvs: try also real server with port 0 in backup server	2011-12-31 16:06:29 +01:00
pcmcia
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-11-01 10:51:38 -07:00
rxrpc
scsi	[SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority	2011-12-15 11:02:07 +04:00
sound	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	target: remove the unused se_dev_list	2011-12-06 06:00:57 +00:00
trace	writeback: show writeback reason with __print_symbolic	2011-12-18 14:20:17 +08:00
video	ARM: OMAP: HWMOD: Unify DSS resets for OMAPs	2011-11-08 03:16:13 -07:00
xen	Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"	2011-12-19 09:30:35 -05:00
Kbuild