kevin/linux
1
Fork 0
Code
fa190ee91f
linux/drivers/staging
History
Linus Torvalds d28619f156 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Convert quota statistics to generic percpu_counter
  ext3 uses rb_node = NULL; to zero rb_root.
  quota: Fixup dquot_transfer
  reiserfs: Fix resuming of quotas on remount read-write
  pohmelfs: Remove dead quota code
  ufs: Remove dead quota code
  udf: Remove dead quota code
  quota: rename default quotactl methods to dquot_
  quota: explicitly set ->dq_op and ->s_qcop
  quota: drop remount argument to ->quota_on and ->quota_off
  quota: move unmount handling into the filesystem
  quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
  quota: move remount handling into the filesystem
  ocfs2: Fix use after free on remount read-only

Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
2010-05-30 09:11:11 -07:00
..
adis16255 staging: adis16255 - TODO issues resolved and typos removed 2010-05-11 14:46:03 -07:00
asus_oled
batman-adv staging: batman: remove all rcu head initializations 2010-05-14 13:14:09 -07:00
comedi Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-05-21 15:26:46 -07:00
crystalhd Staging: crystalhd: Remove typedefs from driver 2010-05-18 14:53:17 -07:00
cx25821 Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
cxt1e1 staging: cxt1e1: fix semaphore build breakage 2010-05-11 14:15:34 -07:00
dream Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
dt3155 Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
dt3155v4l Staging: dt3155v4l: remove private memory allocator 2010-05-18 14:53:17 -07:00
echo staging: trivial: fix typo "seperate" 2010-05-14 13:16:10 -07:00
et131x Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
frontier
go7007 Staging: saa7134-go7007: replace dma_sync_single with dma_sync_single_for_cpu 2010-05-27 09:12:52 -07:00
hv Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
iio Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
line6 Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
memrar staging: memrar depends on RAR_REGISTER 2010-05-11 15:56:19 -07:00
octeon
otus Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
panel Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
phison
pohmelfs Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-05-30 09:11:11 -07:00
quatech_usb2
ramzswap Staging: ramzswap: Handler for swap slot free callback 2010-05-18 15:07:52 -07:00
rar_register Staging: rar_register: depends on PCI 2010-05-11 11:36:19 -07:00
rt2860 staging: rt2860: use new hex_to_bin() method 2010-05-25 08:07:05 -07:00
rt2870
rt3070
rtl8187se Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
rtl8192e Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
rtl8192su Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
rtl8192u Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
samsung-laptop
sep
serqt_usb2
slicoss
sm7xx Staging: Use kcalloc or kzalloc 2010-05-14 14:02:56 -07:00
ti-st staging: ti-st: depends on RFKILL 2010-05-11 14:15:34 -07:00
tm6000 V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers 2010-05-19 12:59:18 -03:00
udlfb Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-05-21 15:26:46 -07:00
usbip Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
vme Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
vt6655 Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
vt6656 Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
winbond Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
wlags49_h2 Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
wlags49_h25 Staging: wlags49_h2*: wireless driver Kconfig update 2010-05-11 15:37:26 -07:00
wlan-ng Staging: wlan-ng prism2usb: add suspend/resume 2010-05-17 16:33:28 -07:00
Kconfig Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
Makefile Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
staging.c