From 5de482e556c44cead3990b0a15cb3ec9aed6737e Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed, 23 Nov 2011 21:39:49 -0500
Subject: [PATCH] --- yaml --- r: 295483 b: refs/heads/master c:
 6c03438edeb5c359af35f060ea016ca65671c269 h: refs/heads/master i:   295481:
 25e0120536583141b389ade53c8a0f08bcc558b8   295479:
 626ce82312b7db4b5775678a0890477ba17ae2bb v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d8c5a15c8116..7401e0e3b9e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35edd9103c84f2b37f63227d12765c38f30495c5
+refs/heads/master: 6c03438edeb5c359af35f060ea016ca65671c269
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 5dba983b8d65..bef5480396d0 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -20,7 +20,6 @@
 #include <linux/printk.h>
 #include <linux/dynamic_debug.h>
 #include <asm/byteorder.h>
-#include <asm/bug.h>
 
 #define USHRT_MAX	((u16)(~0U))
 #define SHRT_MAX	((s16)(USHRT_MAX>>1))