tree 2f044d5898d15edcff858f624618c788d5b58760
parent 2e532d68a2b3e2aa6b19731501222069735c741c
parent 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a
author Linus Torvalds <torvalds@linux-foundation.org> 1224259132 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224259132 -0700

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:
  net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
  ipv4: Add a missing rcu_assign_pointer() in routing cache.
  [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit
  xen-netfront: Avoid unaligned accesses to IP header
  lmc: copy_*_user under spinlock
  [netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA