commit | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 18 07:43:14 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Mar 18 07:43:14 2008 -0700 |
tree | 850cba7afebec402f8db3fa6e9ea5199e858ffd7 | |
parent | ff69c00f0a58383f1f60dd2756e54a857f08d249 [diff] | |
parent | 40044ce0bf2b7e548584d91f108444e83ed5eab3 [diff] |
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 "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