]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e055f7e ebc79c4)
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)
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.

1  2 
fs/ubifs/budget.c patch | diff1 | diff2 | blob | history
fs/ubifs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/ubifs/budget.c
Simple merge
diff --cc fs/ubifs/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.