Linus Torvalds 7b85425fac 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: (31 commits) Revert "ipv4: arp announce, arp_proxy and windows ip conflict verification" igb: return PCI_ERS_RESULT_DISCONNECT on permanent error e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error e1000: fix unmap bug igb: fix unmap length bug ixgbe: fix unmap length bug ixgbe: Fix link capabilities during adapter resets ixgbe: Fix device capabilities of 82599 single speed fiber NICs. ixgbe: Fix SFP log messages usbnet: Remove private stats structure usbnet: Use netdev stats structure smsc95xx: Use netdev stats structure rndis_host: Use netdev stats structure net1080: Use netdev stats structure dm9601: Use netdev stats structure cdc_eem: Use netdev stats structure ipv4: Fix fib_trie rebalancing, part 3 bnx2x: Fix the behavior of ethtool when ONBOOT=no sctp: xmit sctp packet always return no route error ...		2009-07-01 10:29:26 -07:00
..
acpi	Merge branch 'bjorn-notify' into release	2009-06-24 01:22:20 -04:00
asm-generic	alpha: fix percpu build breakage	2009-06-30 18:55:59 -07:00
crypto	…
drm	drm: Fix shifts which were miscalculated when converting from bitfields.	2009-06-24 16:11:04 +10:00
keys	…
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-01 10:29:26 -07:00
math-emu	…
media	V4L/DVB (11901): v4l2: Create helper function for bounding and aligning images	2009-06-23 03:21:18 -03:00
mtd	Kill jffs2-user.h	2009-06-05 17:31:38 +01:00
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6	2009-06-29 19:22:31 -07:00
pcmcia	…
rdma	…
rxrpc	…
scsi	sd, sr: fix Driver 'sd' needs updating message	2009-06-21 12:01:27 -05:00
sound	Merge branch 'topic/pcm-jiffies-check' into for-linus	2009-06-10 07:26:41 +02:00
trace	ext4: convert instrumentation from markers to tracepoints	2009-06-17 11:48:11 -04:00
video	fbdev: s1d13xxxfb: add accelerated bitblt functions	2009-06-16 19:48:00 -07:00
xen	…
Kbuild	[SCSI] FC Pass Thru support	2009-06-12 14:20:05 -05:00