From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Mar 2008 14:43:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25-rc7~110
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=92f53c6f1e47d92b40b1e9e1662b0056c783b962;p=linux-2.6-omap-h63xx.git

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
---

92f53c6f1e47d92b40b1e9e1662b0056c783b962