David S. Miller
ff4783ce78
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/sfc/rx.c
Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-26 21:55:51 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-02-26 21:55:51 -05: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-02-26 21:55:51 -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-26 21:55:51 -05:00
pcmcia
rdma
rxrpc
scsi
[SCSI] libfc: Declare local functions static
2012-01-16 12:45:48 +04:00
sound
Merge branch 'fix/asoc' into for-linus
2012-01-31 15:13:14 +01:00
target
target: Change target_submit_cmd() to return void
2012-02-07 06:41:04 +00:00
trace
writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue
2012-02-06 11:17:25 +08:00
video
fbdev fixes for 3.3
2012-02-07 15:54:02 -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