aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:06:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:06:37 -0700
commitdcbeb0bec5f2695c3ff53f174efb8e03c209f3f3 (patch)
tree30d223a3a3c7470c657284ef030657bd1753d4d3 /arch/m32r/include/asm/device.h
parent2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7 (diff)
parent444528b3e614f7f2391488d9bca8e0b872db909b (diff)
downloadkernel_samsung_espresso10-dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3.zip
kernel_samsung_espresso10-dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3.tar.gz
kernel_samsung_espresso10-dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: always pin metadata in discard mode Btrfs: enable discard support Btrfs: add -o discard option Btrfs: properly wait log writers during log sync Btrfs: fix possible ENOSPC problems with truncate Btrfs: fix btrfs acl #ifdef checks Btrfs: streamline tree-log btree block writeout Btrfs: avoid tree log commit when there are no changes Btrfs: only write one super copy during fsync
Diffstat (limited to 'arch/m32r/include/asm/device.h')
0 files changed, 0 insertions, 0 deletions