David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/bluetooth/l2cap_core.c

2011-07-14 07:56:40 -07:00

..

acpi

…

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

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

drm

…

keys

…

linux

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-14 07:56:40 -07:00

pcmcia

…

rdma

…

rxrpc

…

scsi

…

sound

ALSA: sb16 - Fix build errors on MIPS and others with 13bit ioctl size

2011-06-30 15:33:57 +02:00

target

…

trace

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-07-05 23:23:37 -07:00

video

…

xen

…

Kbuild

…