Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 09:58:39 +0000 (19:58 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Jan 2011 09:58:39 +0000 (19:58 +1000)
commitd315777b32a4696feb86f2a0c9e9f39c94683649
treef21c24d85cde6ad453c4d9485f5de49357336f81
parent5a05a6d7a51bcc47c5c6f0ed68e433f9a01afd89
parent1765e3a4933ea0870fabd755feffc5473c4363ce
Merge branch 'BUG_ON' of git://git./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