]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Mon, 21 Sep 2009 09:09:22 +0000 (12:09 +0300)
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Mon, 21 Sep 2009 09:09:22 +0000 (12:09 +0300)
commit7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0
treeb064d077928cf224660ab1e1841cdab2c9fd8b08
parente055f7e873d900925c222cf2d1ec955af4a9ca90
parentebc79c4f8da0f92efa968e0328f32334a2ce80cf
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into linux-next

Conflicts:
fs/ubifs/super.c

Merge the upstream tree in order to resolve a conflict with the
per-bdi writeback changes from the linux-2.6-block tree.
fs/ubifs/budget.c
fs/ubifs/super.c