Russell King 18bbff9f67 Merge branch 'sa11x0-lcd' into sa11x0 ... Conflicts: arch/arm/mach-sa1100/assabet.c		2012-03-25 23:55:54 +01:00
..
acpi	Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release	2012-01-23 19:47:06 -05:00
asm-generic	lib: add NO_GENERIC_PCI_IOPORT_MAP	2012-01-31 23:19:47 +02:00
crypto
drm	drm: Fix authentication kernel crash	2012-01-25 09:27:45 +00:00
keys	keys: add a "logon" key type	2012-01-17 22:39:40 -06:00
linux	DMA: sa11x0: add SA-11x0 DMA driver	2012-03-07 11:32:21 +00:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
misc
mtd
net	net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL	2012-01-30 12:41:06 -05:00
pcmcia
rdma
rxrpc
scsi	[SCSI] libfc: Declare local functions static	2012-01-16 12:45:48 +04:00
sound	Merge branch 'fix/asoc' into for-linus	2012-01-31 15:13:14 +01:00
target	target: Change target_submit_cmd() to return void	2012-02-07 06:41:04 +00:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-01-17 15:49:54 -08:00
video	FB: sa1100: remove global sa1100fb_.*_power function pointers	2012-02-21 11:56:19 +00:00
xen	Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block	2012-01-15 12:48:41 -08:00
Kbuild