diff options
author | 2009-06-16 11:46:45 -0700 | |
---|---|---|
committer | 2009-06-16 11:46:45 -0700 | |
commit | d613839ef987d20f7c9347732b452efd921b97d9 (patch) | |
tree | 5998f460596d8dca129d0f116add8f9abddfad38 /include/linux/kernel.h | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
parent | block: remove some includings of blktrace_api.h (diff) | |
download | wireguard-linux-d613839ef987d20f7c9347732b452efd921b97d9.tar.xz wireguard-linux-d613839ef987d20f7c9347732b452efd921b97d9.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: remove some includings of blktrace_api.h
mg_disk: seperate mg_disk.h again
block: Introduce helper to reset queue limits to default values
cfq: remove extraneous '\n' in blktrace output
ubifs: register backing_dev_info
btrfs: properly register fs backing device
block: don't overwrite bdi->state after bdi_init() has been run
cfq: cleanup for last_end_request in cfq_data
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions