linux/drivers/staging/pohmelfs
Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
2011-01-10 16:04:53 -08:00
..
config.c staging: Drop unnecessary null test 2010-08-31 11:13:15 -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: fix spaces and TAB coding style issue in dir.c 2010-05-11 11:35:41 -07:00
inode.c Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -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 Staging: pohmelfs: fix spaces and TAB coding style issue in net.c 2010-05-11 11:35:41 -07:00
netfs.h Staging: pohmelfs: fix spaces and TAB coding style issue in netfs.h 2010-05-11 11:35:41 -07: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