tree f21c24d85cde6ad453c4d9485f5de49357336f81
parent 5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89
parent 1765e3a4933ea0870fabd755feffc5473c4363ce
author Linus Torvalds <torvalds@linux-foundation.org> 1295863119 +1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1295863119 +1000

Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  Remove MAYBE_BUILD_BUG_ON
  BUILD_BUG_ON: make it handle more cases