p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/staging
History
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 Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
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 staging: clearpad_tm1217 depends on INPUT 2010-11-19 17:17:45 -08:00
crystalhd staging: crystalhd: fix memory leaks 2011-03-14 12:23:34 -07:00
cs5535_gpio staging: cs5535_gpio: check put_user() return code 2011-01-21 12:35:14 -08:00
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 staging/trivial: fix typos concerning "consistent" 2011-02-18 13:30:10 -08:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
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 staging: echo: fix a typo ("overflow") 2011-03-02 16:03:59 -05:00
et131x staging/et131x: fix et131x_rx_dma_disable halt_status usage 2011-02-23 14:39:09 -08:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 staging: ft1000: Fix coding style in ft1000_proc_drvmsg function. 2011-03-14 11:51:21 -07:00
generic_serial Staging: generic_serial: fix double locking bug 2011-02-28 13:21:20 -08:00
gma500 staging: gma500: fix build errors 2011-03-07 13:28:47 -08:00
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 staging/trivial: fix typos concerning "select" 2011-02-18 13:30:12 -08:00
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 Staging: sep: handle the memrar stuff in the headers 2010-11-29 11:17:27 -08:00
msm staging: msm: Use explicit GPLv2 licenses 2011-02-18 13:21:56 -08:00
octeon staging: octeon: change a typo comamnd to command 2011-02-04 13:01:03 -08:00
olpc_dcon backlight: add backlight type 2011-03-22 17:43:59 -07:00
panel
…
phison Staging: phison: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
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 Staging: quickstart: fixed coding style issues 2011-02-09 12:11:55 -08:00
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 staging: rts_pstor: MSXC card power class 2011-03-09 16:01:29 -08:00
samsung-laptop backlight: add backlight type 2011-03-22 17:43:59 -07:00
sbe-2t3e3
…
sep staging: sep: remove unused ioctls 2011-03-07 13:42:34 -08:00
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 console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
solo6x10 staging: Solo6x10: Changed solo6010* -> solo*, solo6x10* etc. 2011-02-18 12:37:04 -08:00
speakup staging: speakup: Remove NULL check before kfree 2011-03-14 11:57:36 -07:00
spectra staging: spectra: optimize kmalloc to kzalloc 2011-03-09 15:54:32 -08:00
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 drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
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 staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
zram staging: Allow sharing xvmalloc for zram and zcache 2011-02-23 14:02:56 -08:00
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
…