linux/drivers/staging
Linus Torvalds b4fdcb02f1 Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block
* 'for-3.2/core' of git://git.kernel.dk/linux-block: (29 commits)
  block: don't call blk_drain_queue() if elevator is not up
  blk-throttle: use queue_is_locked() instead of lockdep_is_held()
  blk-throttle: Take blkcg->lock while traversing blkcg->policy_list
  blk-throttle: Free up policy node associated with deleted rule
  block: warn if tag is greater than real_max_depth.
  block: make gendisk hold a reference to its queue
  blk-flush: move the queue kick into
  blk-flush: fix invalid BUG_ON in blk_insert_flush
  block: Remove the control of complete cpu from bio.
  block: fix a typo in the blk-cgroup.h file
  block: initialize the bounce pool if high memory may be added later
  block: fix request_queue lifetime handling by making blk_queue_cleanup() properly shutdown
  block: drop @tsk from attempt_plug_merge() and explain sync rules
  block: make get_request[_wait]() fail if queue is dead
  block: reorganize throtl_get_tg() and blk_throtl_bio()
  block: reorganize queue draining
  block: drop unnecessary blk_get/put_queue() in scsi_cmd_ioctl() and blk_get_tg()
  block: pass around REQ_* flags instead of broken down booleans during request alloc/free
  block: move blk_throtl prototypes to block/blk.h
  block: fix genhd refcounting in blkio_policy_parse_and_set()
  ...

Fix up trivial conflicts due to "mddev_t" -> "struct mddev" conversion
and making the request functions be of type "void" instead of "int" in
 - drivers/md/{faulty.c,linear.c,md.c,md.h,multipath.c,raid0.c,raid1.c,raid10.c,raid5.c}
 - drivers/staging/zram/zram_drv.c
2011-11-04 17:06:58 -07:00
..
asus_oled
bcm Staging: bcm: Fix three initialization errors in InterfaceDld.c 2011-10-23 10:16:34 +02:00
comedi Staging: comedi: fix brace coding style issue in ni_atmio.c 2011-10-17 15:11:30 -07:00
cptm1217
crystalhd staging: crystalhd/bc_dts_types.h: typedef cleanup 2011-09-16 20:12:56 +02:00
cxt1e1 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
echo
et131x Remove stale "depends on NETDEV_1000"in staging drivers 2011-10-26 17:21:19 +02:00
frontier
ft1000
gma500 staging: gma500: gtt based hardware scrolling console 2011-09-26 17:32:54 -07:00
hv Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2011-10-28 05:08:40 -07:00
iio treewide: use __printf not __attribute__((format(printf,...))) 2011-10-31 17:30:54 -07:00
intel_sst staging: intel_sst: fix compile error 2011-10-03 16:07:50 -07:00
keucr
line6
media staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
mei staging: mei: clean the TODO file from done tasks. 2011-10-17 15:46:48 -07:00
nvec staging/nvec: fix compilation error in nvec.c 2011-10-17 15:24:11 -07:00
octeon Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-10-24 18:18:09 -04:00
olpc_dcon staging: Add module.h to drivers/staging users 2011-08-25 17:01:20 -07:00
panel staging: panel: Fixed checkpatch warning about simple_strtoul() 2011-09-06 16:49:29 -07:00
phison
pohmelfs filesystems: add set_nlink() 2011-11-02 12:53:43 +01:00
quatech_usb2 staging: quatech_usb2: Potential lost wakeup scenario in TIOCMIWAIT 2011-09-19 10:46:18 -07:00
quickstart
rtl8187se Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
rtl8192e Staging: rtl8192e: off by one in rtl8192_get_channel_map() 2011-09-26 17:26:03 -07:00
rtl8192u Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
rtl8712 staging: r8712u: Fix possible out-of-bounds index with TKIP and AES keys 2011-10-11 10:02:49 -06:00
rts5139 staging: fix rts5139 depends & build 2011-08-26 11:35:54 -07:00
rts_pstor drivers: staging: rts_pstor fixed checkpatch warnings 2011-10-17 15:17:17 -07:00
sbe-2t3e3
sep staging: sep: call to sep_ioctl() may leave driver in unusable state 2011-09-06 16:49:29 -07:00
serial TTY: serial, move 68360 driver to staging 2011-09-22 16:00:20 -07:00
serqt_usb2 staging: serqt_usb2: remove ssu100 from supported devices 2011-08-29 11:20:11 -07:00
slicoss Remove stale "depends on NETDEV_1000"in staging drivers 2011-10-26 17:21:19 +02:00
sm7xx staging: Add module.h to drivers/staging users 2011-08-25 17:01:20 -07:00
speakup
spectra
ste_rmi4 staging: Add module.h to drivers/staging users 2011-08-25 17:01:20 -07:00
tidspbridge staging: tidspbridge: MMU2 registers are limited to 32-bit data access 2011-10-19 13:42:49 -07:00
usbip staging: usbip: fix up api changes that broke windows clients 2011-09-19 10:45:03 -07:00
vme staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX 2011-10-17 15:43:13 -07:00
vt6655 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
vt6656 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
winbond Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
wlags49_h2 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
wlags49_h25 Staging: wlags49_h25: Makefile: remove unneeded stuff 2011-10-18 13:36:04 -07:00
wlan-ng
xgifb Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2011-10-30 15:30:01 -07:00
zcache Merge branch 'staging-next' into Linux 3.1 2011-10-25 09:18:11 +02:00
zram Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block 2011-11-04 17:06:58 -07:00
Kconfig staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
Makefile staging: Move media drivers to staging/media 2011-11-03 07:59:03 -02:00
staging.c