David S. Miller d07d4c239b Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next ...

Conflicts:
	drivers/net/can/usb/ems_usb.c

Minor dev_warn --> netdev_warn conversion conflicts.

2012-02-04 16:42:19 -05: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

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08: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

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

2012-02-04 16:42:19 -05: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-02-04 16:39:32 -05:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

target

…

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

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…