Commit dcbf77ca authored Aug 10, 2009 by Rafael J. Wysocki

Merge branch 'master' into for-linus

parents c00aafcd 85dfd81d

Documentation/arm/memory.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use.
	For SA11xx and Xscale, this is used to		For SA11xx and Xscale, this is used to
	setup a minicache mapping.		setup a minicache mapping.

			ffff4000 ffffffff cache aliasing on ARMv6 and later CPUs.

	ffff1000 ffff7fff Reserved.		ffff1000 ffff7fff Reserved.
	Platforms must not use this address range.		Platforms must not use this address range.

Documentation/ioctl/ioctl-number.txt

+1 −0

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

Documentation/lockdep-design.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -30,9 +30,9 @@ State
	The validator tracks lock-class usage history into 4n + 1 separate state bits:		The validator tracks lock-class usage history into 4n + 1 separate state bits:

	- 'ever held in STATE context'		- 'ever held in STATE context'
	- 'ever head as readlock in STATE context'		- 'ever held as readlock in STATE context'
	- 'ever head with STATE enabled'		- 'ever held with STATE enabled'
	- 'ever head as readlock with STATE enabled'		- 'ever held as readlock with STATE enabled'

	Where STATE can be either one of (kernel/lockdep_states.h)		Where STATE can be either one of (kernel/lockdep_states.h)
	- hardirq		- hardirq

arch/arm/boot/compressed/misc.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ unsigned int __machine_arch_type;

	static void putstr(const char *ptr);		static void putstr(const char *ptr);

	#include <linux/compiler.h>
	#include <mach/uncompress.h>		#include <mach/uncompress.h>

	#ifdef CONFIG_DEBUG_ICEDCC		#ifdef CONFIG_DEBUG_ICEDCC

arch/arm/common/clkdev.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	#include <linux/err.h>		#include <linux/err.h>
	#include <linux/string.h>		#include <linux/string.h>
	#include <linux/mutex.h>		#include <linux/mutex.h>
			#include <linux/clk.h>

	#include <asm/clkdev.h>		#include <asm/clkdev.h>
	#include <mach/clkdev.h>		#include <mach/clkdev.h>