projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fc1d39 016f1c5 9efabc8)
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 16:51:43 +0000 (09:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 16:51:43 +0000 (09:51 -0700)
* branch 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: not build debug messages with CONFIG_UBIFS_FS_DEBUG disabled

* branch 'linux-next' of git://git.infradead.org/ubi-2.6:
  UBI: do not link debug messages when debugging is disabled


Trivial merge
Motorola kernel-slsi