---

yaml --- r: 156607 b: refs/heads/master c: d25f143 h: refs/heads/master i: 156605: d6b9eac 156603: e8a3870 156599: 8b121cf 156591: 5eb6694 156575: 91a47f0 156543: d6d4f46 v: v3
git-mirror · Aug 7, 2009 · 8a41e2a · 8a41e2a
1 parent 63cc680
commit 8a41e2a
Show file tree

Hide file tree

Showing 194 changed files with 1,584 additions and 2,898 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bcf73f48280ef8cd7f2e38e674da47c409b9906
+refs/heads/master: d25f14389a65c7f95512b01415d8d4a8d62855ab
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
@@ -21,8 +21,6 @@ ffff8000	ffffffff	copy_user_page / clear_user_page use.
 				For SA11xx and Xscale, this is used to
 				setup a minicache mapping.
 
-ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.
-
 ffff1000	ffff7fff	Reserved.
 				Platforms must not use this address range.
 

diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -139,7 +139,6 @@ Code	Seq#	Include File		Comments
 'm'	all	linux/synclink.h	conflict!
 'm'	00-1F	net/irda/irmod.h	conflict!
 'n'	00-7F	linux/ncp_fs.h
-'n'	80-8F	linux/nilfs2_fs.h	NILFS2
 'n'	E0-FF	video/matrox.h          matroxfb
 'o'	00-1F	fs/ocfs2/ocfs2_fs.h	OCFS2
 'o'     00-03   include/mtd/ubi-user.h  conflict! (OCFS2 and UBI overlaps)

diff --git a/trunk/Documentation/lockdep-design.txt b/trunk/Documentation/lockdep-design.txt
@@ -30,9 +30,9 @@ State
 The validator tracks lock-class usage history into 4n + 1 separate state bits:
 
 - 'ever held in STATE context'
-- 'ever held as readlock in STATE context'
-- 'ever held with STATE enabled'
-- 'ever held as readlock with STATE enabled'
+- 'ever head as readlock in STATE context'
+- 'ever head with STATE enabled'
+- 'ever head as readlock with STATE enabled'
 
 Where STATE can be either one of (kernel/lockdep_states.h)
  - hardirq

diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -29,6 +29,7 @@ unsigned int __machine_arch_type;
 
 static void putstr(const char *ptr);
 
+#include <linux/compiler.h>
 #include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC

diff --git a/trunk/arch/arm/common/clkdev.c b/trunk/arch/arm/common/clkdev.c
@@ -17,7 +17,6 @@
 #include <linux/err.h>
 #include <linux/string.h>
 #include <linux/mutex.h>
-#include <linux/clk.h>
 
 #include <asm/clkdev.h>
 #include <mach/clkdev.h>