]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 95cb602 f2a7817)
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)
commitd2fd4e8d33d48f32a43c99b09f3780daf2b461f2
treeb064d077928cf224660ab1e1841cdab2c9fd8b08tree | snapshot
parent95cb6028eb5d1427e21a001bfdb75c7503bc309acommit | diff
parentf2a7817090d1f9d728d1f5ecacdcde14ed4ad753commit | 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.
fs/ubifs/budget.c diff1 | diff2 | blob | history
fs/ubifs/super.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.