David S. Miller
32efe08d77
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Small minor conflict in bnx2x, wherein one commit changed how
statistics were stored in software, and another commit
fixed endianness bugs wrt. reading the values provided by
the chip in memory.
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-19 16:03:15 -05:00
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release
2012-01-23 19:47:06 -05:00
lib: add NO_GENERIC_PCI_IOPORT_MAP
2012-01-31 23:19:47 +02:00
drm: Fix authentication kernel crash
2012-01-25 09:27:45 +00:00
keys: add a "logon" key type
2012-01-17 22:39:40 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-02-19 16:03:15 -05:00
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
mtd: document that MEMWRITE ioctl is NAND-specific
2012-01-09 18:18:36 +00:00
ipv4: Eliminate spurious argument to __ipv4_neigh_lookup
2012-02-15 17:48:35 -05:00
rdma/core: Fix sparse warnings
2012-01-04 09:17:45 -08:00
[SCSI] libfc: Declare local functions static
2012-01-16 12:45:48 +04:00
Merge branch 'fix/asoc' into for-linus
2012-01-31 15:13:14 +01:00
target: Change target_submit_cmd() to return void
2012-02-07 06:41:04 +00:00
writeback: fix dereferencing NULL bdi->dev on trace_writeback_queue
2012-02-06 11:17:25 +08:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block
2012-01-15 12:48:41 -08:00
32efe08d77