David S. Miller c1e48efc70 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/benet/be_main.c		2011-04-07 14:05:23 -07:00
..
acpi	Merge branch 'linus' into release	2011-03-23 02:34:54 -04:00
asm-generic	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-25 17:52:22 -07:00
crypto
drm	drm/vblank: update recently added vbl interface to be more future proof.	2011-03-24 21:28:46 +10:00
keys	RxRPC: Fix v1 keys	2011-03-02 22:18:53 -08:00
linux	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-07 14:05:23 -07:00
math-emu
media	[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t	2011-03-22 19:41:58 -03:00
mtd
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-07 14:05:23 -07:00
pcmcia	pcmcia: re-enable Zoomed Video support	2011-02-20 12:47:34 +01:00
rdma
rxrpc
scsi	[SCSI] libiscsi_tcp: use kmap in xmit path	2011-03-23 11:36:58 -05:00
sound	ALSA: vmalloc buffers should use normal mmap	2011-03-25 11:13:12 +01:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target	[SCSI] target: add initial statistics	2011-03-23 11:36:50 -05:00
trace	Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable	2011-03-28 15:31:05 -07:00
video	atmel_lcdfb: implement inverted contrast pwm	2011-03-22 16:23:44 +09:00
xen	Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-03-17 18:37:42 -07:00
Kbuild