| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | |
| Mon, 21 Sep 2009 09:09:22 +0000 (12:09 +0300) | ||
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | |
| Mon, 21 Sep 2009 09:09:22 +0000 (12:09 +0300) | ||
| commit | 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 | |
| tree | b064d077928cf224660ab1e1841cdab2c9fd8b08 | tree | snapshot (tar.xz tar.gz zip) |
| parent | e055f7e873d900925c222cf2d1ec955af4a9ca90 | commit | diff |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf | commit | diff |
Merge branch 'master' of git://git.kernel.org/pub/scm/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.
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 | diff1 | | diff2 | | blob | history |
| fs/ubifs/super.c | diff1 | | diff2 | | blob | history |