Paul Mundt 701ec7a7b0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2010-08-04 11:56:17 +09:00
..
acpi	ACPI: skip checking BM_STS if the BIOS doesn't ask for it	2010-07-22 16:54:27 -04:00
asm-generic	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2010-07-23 13:26:16 -07:00
crypto
drm	drm/ttm: Allocate the page pool manager in the heap.	2010-07-07 12:14:11 +10:00
keys
linux	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-08-04 11:56:17 +09:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner	2010-07-08 16:49:53 -03:00
mtd
net	net/9p: Implement TXATTRCREATE 9p call	2010-08-02 14:28:34 -05:00
pcmcia
rdma
rxrpc
scsi	SCSI: implement sd_unlock_native_capacity()	2010-06-02 13:50:04 -04:00
sound
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-06-10 09:30:09 -07:00
video	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-05-31 13:14:26 +09:00
xen
Kbuild