diff options
author | 2010-09-25 09:51:54 -0700 | |
---|---|---|
committer | 2010-09-25 09:51:54 -0700 | |
commit | 56162badadb91aae93843d8d6558c7d7780e3cb2 (patch) | |
tree | 6ec96e5b1e41672b45cacf9080d5f3f0db97118a /arch/arm/mach-s3c2410/h1940-bluetooth.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
parent | block: prevent merges of discard and write requests (diff) | |
download | linux-dev-56162badadb91aae93843d8d6558c7d7780e3cb2.tar.xz linux-dev-56162badadb91aae93843d8d6558c7d7780e3cb2.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: prevent merges of discard and write requests
Diffstat (limited to 'arch/arm/mach-s3c2410/h1940-bluetooth.c')
0 files changed, 0 insertions, 0 deletions