diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 08:05:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-15 08:05:37 -0700 |
| commit | c6538499814d8112c5d4d08570a7cf0758e5f8f5 (patch) | |
| tree | 3c3574d8aea838d91372765847577772092f09bc /COPYING | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Revert "mm: add /proc controls for pdflush threads" (diff) | |
| download | linux-dev-c6538499814d8112c5d4d08570a7cf0758e5f8f5.tar.xz linux-dev-c6538499814d8112c5d4d08570a7cf0758e5f8f5.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:
Revert "mm: add /proc controls for pdflush threads"
viocd: needs to depend on BLOCK
block: fix the bio_vec array index out-of-bounds test
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions