kernel-fxtec-pro1x/drivers/staging
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
altera-stapl [media] Altera FPGA firmware download module 2011-03-21 20:32:16 -03:00
asus_oled
ath6kl ath6kl: remove-typedef HIF_DEVICE 2011-03-14 11:58:57 -07:00
bcm staging: bcm: Remove NULL check before kfree 2011-03-14 11:57:30 -07:00
brcm80211 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
comedi staging: comedi: Remove NULL check before kfree 2011-03-14 11:57:31 -07:00
cptm1217
crystalhd staging: crystalhd: fix memory leaks 2011-03-14 12:23:34 -07:00
cs5535_gpio
cx25821 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
cxd2099 [media] ngene: Fix compilation when cxd2099 is not enabled 2011-03-21 20:31:48 -03:00
cxt1e1
dt3155v4l
easycap Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
echo
et131x
frontier
ft1000 staging: ft1000: Fix coding style in ft1000_proc_drvmsg function. 2011-03-14 11:51:21 -07:00
generic_serial
gma500
go7007 staging: go7007: Remove NULL check before kfree 2011-03-14 11:57:32 -07:00
hv Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
iio Staging: IIO: DAC: AD5624R: Consistency cleanup - no functional changes 2011-03-14 12:21:28 -07:00
intel_sst
keucr staging: keucr: Remove NULL check before kfree 2011-03-14 11:57:32 -07:00
line6 staging: line6: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
lirc Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
memrar
msm
octeon
olpc_dcon backlight: add backlight type 2011-03-22 17:43:59 -07:00
panel
phison
pohmelfs Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
quatech_usb2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
quickstart
rt2860 staging: rt2860: Remove NULL check before kfree 2011-03-14 11:57:33 -07:00
rt2870
rtl8187se staging: rtl8187se: Remove NULL check before kfree 2011-03-14 11:57:34 -07:00
rtl8192e staging: rtl8192e: Don't copy dev pointer to skb 2011-03-14 12:24:48 -07:00
rtl8192u staging: rtl8192u: Remove NULL check before kfree 2011-03-14 11:57:35 -07:00
rtl8712 staging: rtl8712: Remove NULL check before kfree 2011-03-14 11:57:35 -07:00
rts_pstor
samsung-laptop backlight: add backlight type 2011-03-22 17:43:59 -07:00
sbe-2t3e3
sep
serqt_usb2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
slicoss
sm7xx
solo6x10
speakup staging: speakup: Remove NULL check before kfree 2011-03-14 11:57:36 -07:00
spectra
ste_rmi4 staging: ste_rmi4: fix memory leaks 2011-03-14 12:22:54 -07:00
tidspbridge staging: tidspbridge: protect dmm_map properly 2011-03-14 12:22:27 -07:00
tm6000 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
tty drivers/staging/tty/specialix.c: convert func_enter to func_exit 2011-03-23 19:46:39 -07:00
usbip Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
vme staging: vme: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
vt6655 staging: vt6655: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
vt6656 staging: vt6656: Remove NULL check before kfree 2011-03-14 11:57:37 -07:00
westbridge Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
winbond Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-03-16 16:29:25 -07:00
wlags49_h2
wlags49_h25
wlan-ng staging: wlan-ng: Remove NULL check before kfree 2011-03-14 11:57:38 -07:00
xgifb staging: xgifb: clean up register function variable names 2011-03-14 11:52:34 -07:00
zcache
zram
Kconfig Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
Makefile Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
staging.c