From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Jan 2011 09:58:39 +0000 (+1000)
Subject: Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux... 
X-Git-Tag: v3.0~1988
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d315777b32a4696feb86f2a0c9e9f39c94683649;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

d315777b32a4696feb86f2a0c9e9f39c94683649