Linus Torvalds 1268afe676 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (41 commits) sctp: user perfect name for Delayed SACK Timer option net: fix can_checksum_protocol() arguments swap Revert "netlink: test for all flags of the NLM_F_DUMP composite" gianfar: Fix misleading indentation in startup_gfar() net/irda/sh_irda: return to RX mode when TX error net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan. USB CDC NCM: tx_fixup() race condition fix ns83820: Avoid bad pointer deref in ns83820_init_one(). ipv6: Silence privacy extensions initialization bnx2x: Update bnx2x version to 1.62.00-4 bnx2x: Fix AER setting for BCM57712 bnx2x: Fix BCM84823 LED behavior bnx2x: Mark full duplex on some external PHYs bnx2x: Fix BCM8073/BCM8727 microcode loading bnx2x: LED fix for BCM8727 over BCM57712 bnx2x: Common init will be executed only once after POR bnx2x: Swap BCM8073 PHY polarity if required iwlwifi: fix valid chain reading from EEPROM ath5k: fix locking in tx_complete_poll_work ath9k_hw: do PA offset calibration only on longcal interval ...		2011-01-19 20:25:45 -08:00
..
acpi	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-01-14 09:29:05 -08:00
asm-generic	fix non-x86 build failure in pmdp_get_and_clear	2011-01-16 15:05:44 -08:00
crypto	crypto: padlock - Move padlock.h into include/crypto	2011-01-07 14:52:00 +11:00
drm	Revert "drm: Update fbdev fb_fix_screeninfo"	2011-01-14 16:10:28 -08:00
keys	keys: add new key-type encrypted	2010-11-29 08:55:29 +11:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-19 20:25:45 -08:00
math-emu
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-19 20:25:45 -08:00
pcmcia
rdma	RDMA: Update workqueue usage	2011-01-16 21:16:31 -08:00
rxrpc
scsi	Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block	2011-01-13 10:45:01 -08:00
sound	ALSA: constify functions in ac97	2011-01-14 19:14:47 +01:00
target	[SCSI] target: Add LIO target core v4.0.0-rc6	2011-01-14 10:12:29 -06:00
trace	Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-01-15 12:45:00 -08:00
video	Merge branch 'fbdev/udlfb'	2011-01-06 18:10:09 +09:00
xen	Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-01-13 18:46:48 -08:00
Kbuild