]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf089a556f9673817a094b104690da9e19926672e
tree3dbde7655ffe1cf95f3fa3592c342c9c77d2a013
parentad37d0065268b87eacfb78a5c9cf27332876bb14
parent2201a1c24791e065b9350a0af2786326a7cb10ff
parenta94ab239c46c1dc85c3b782391dbc5026822ccae
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradead.org/ubi-2.6

* 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