diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-25 18:51:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-25 18:51:54 +0200 |
| commit | 56162badadb91aae93843d8d6558c7d7780e3cb2 (patch) | |
| tree | 6ec96e5b1e41672b45cacf9080d5f3f0db97118a /drivers/hwmon/coretemp.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | block: prevent merges of discard and write requests (diff) | |
| download | linux-56162badadb91aae93843d8d6558c7d7780e3cb2.tar.xz linux-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 '')
0 files changed, 0 insertions, 0 deletions