Linus Torvalds 8d86e5f914 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/mm: Fix memory_block_size_bytes() for non-pseries mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header		2011-07-12 14:21:19 -07:00
..
acpi	Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release	2011-05-29 04:38:48 -04:00
asm-generic	Merge branches 'gpio/merge' and 'spi/merge' of git://git.secretlab.ca/git/linux-2.6	2011-06-17 10:36:32 -07:00
crypto
drm	drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.	2011-06-16 16:30:54 +10:00
keys
linux	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-07-12 14:21:19 -07:00
math-emu
media	[media] tuner-core/v4l2-subdev: document that the type field has to be filled in	2011-07-07 15:04:23 -03:00
mtd
net	ipv6: Don't put artificial limit on routing table size.	2011-07-01 17:30:43 -07:00
pcmcia	pcmcia: Make declaration and uses of struct pcmcia_device_id const	2011-05-06 07:46:15 +02:00
rdma	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-05-26 12:13:57 -07:00
rxrpc
scsi	[SCSI] libsas: Add option for SATA soft reset	2011-05-26 22:49:33 -05:00
sound	ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size	2011-06-30 15:33:57 +02:00
target	[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun	2011-05-24 13:02:42 -04:00
trace	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4	2011-06-21 10:22:35 -07:00
video	Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6	2011-05-24 15:49:57 +09:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem	2011-05-26 10:50:56 -07:00
Kbuild