Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ...

Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-01-09 16:16:29 +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

encrypted-keys: add key format support

2011-06-27 09:10:45 -04:00

linux

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +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

mtd: kill old field for `struct mtd_info_user'

2011-09-11 15:57:44 +03:00

net

ipvs: try also real server with port 0 in backup server

2011-12-31 16:06:29 +01:00

pcmcia

pcmcia: add PCMCIA_DEVICE_MANF_CARD_PROD_ID3

2011-08-08 16:04:11 -04:00

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

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

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

ASoC: mxs-saif: remove function in platform_data

2011-12-02 13:56:42 +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

…