linux/drivers/staging/pohmelfs
Linus Torvalds 7a6362800c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.
2011-03-16 16:29:25 -07:00
..
config.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
crypto.c pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm wrappers. 2010-11-09 16:07:08 -08:00
dir.c Staging: pohmelfs/dir.c: Remove unneeded mutex_unlock() from pohmelfs_rename() 2011-01-21 12:38:46 -08:00
inode.c staging: pohmelfs: Fix some typos, and comments. 2011-02-04 13:01:02 -08:00
Kconfig Staging: pohmelfs: fix kconfig dependencies 2009-04-03 14:53:36 -07:00
lock.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Makefile Staging: pohmelfs: kconfig/makefile and vfs changes. 2009-04-03 14:53:36 -07:00
mcache.c Staging: pohmelfs: distributed locking and cache coherency protocol. 2009-04-03 14:53:34 -07:00
net.c pohmelfs: double-free and leak 2011-01-12 20:02:44 -05:00
netfs.h staging: pohmelfs: Fix some typos, and comments. 2011-02-04 13:01:02 -08:00
path_entry.c fs: dcache remove dcache_lock 2011-01-07 17:50:23 +11:00
trans.c Staging: pohmelfs: sync with the development tree 2009-09-15 12:02:30 -07:00