]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff69c00 40044ce)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:43:14 +0000 (07:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Mar 2008 14:43:14 +0000 (07:43 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "unexport bio_{,un}map_user"
  relay: fix subbuf_splice_actor() adding too many pages
  The ps2esdi driver was marked as BROKEN more than two years ago due to being


Trivial merge
Linux 2.6 source tree