diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:39:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 15:39:16 -0700 |
| commit | 2cf812d732442e86c1e2018e23ad82f9bc594a38 (patch) | |
| tree | c530171e406efdebc3fa91501f484260ee781296 /include/net/mac80211.h | |
| parent | ae83060026537885fd23737af161fee8afd04f4b (diff) | |
| parent | 14d9fa352592582e457cf75022202766baac1348 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Make SCSI SG v4 driver enabled by default and remove EXPERIMENTAL dependency, since udev depends on BSG
block: Update topology documentation
block: Stack optimal I/O size
block: Add a wrapper for setting minimum request size without a queue
block: Make blk_queue_stack_limits use the new stacking interface
Diffstat (limited to 'include/net/mac80211.h')
0 files changed, 0 insertions, 0 deletions