Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f03292e authored Feb 25, 2010 by Jens Axboe

Merge branch 'master' into for-2.6.34



Conflicts:
	include/linux/blkdev.h

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

parents c5ecc484 baac35c4

Documentation/networking/ip-sysctl.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1074,10 +1074,10 @@ regen_max_retry - INTEGER
	Default: 5		Default: 5

	max_addresses - INTEGER		max_addresses - INTEGER
	Number of maximum addresses per interface. 0 disables limitation.		Maximum number of autoconfigured addresses per interface. Setting
	It is recommended not set too large value (or 0) because it would		to zero disables the limitation. It is not recommended to set this
	be too easy way to crash kernel to allow to create too much of		value too large (or to zero) because it would be an easy way to
	autoconfigured addresses.		crash the kernel by allowing too many addresses to be created.
	Default: 16		Default: 16

	disable_ipv6 - BOOLEAN		disable_ipv6 - BOOLEAN

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3489,9 +3489,9 @@ S: Maintained
	F: drivers/net/wireless/libertas/		F: drivers/net/wireless/libertas/

	MARVELL MV643XX ETHERNET DRIVER		MARVELL MV643XX ETHERNET DRIVER
	M: Lennert Buytenhek <buytenh@marvell.com>		M: Lennert Buytenhek <buytenh@wantstofly.org>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Supported		S: Maintained
	F: drivers/net/mv643xx_eth.*		F: drivers/net/mv643xx_eth.*
	F: include/linux/mv643xx.h		F: include/linux/mv643xx.h

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 33		SUBLEVEL = 33
	EXTRAVERSION = -rc8		EXTRAVERSION =
	NAME = Man-Eating Seals of Antiquity		NAME = Man-Eating Seals of Antiquity

	# DOCUMENTATION		# DOCUMENTATION

arch/ia64/sn/kernel/setup.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
	DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);		DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
	EXPORT_PER_CPU_SYMBOL(__sn_hub_info);		EXPORT_PER_CPU_SYMBOL(__sn_hub_info);

	DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);		DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
	EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);		EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);

	DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);		DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);

arch/microblaze/include/asm/io.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -217,7 +217,7 @@ static inline void __iomem *__ioremap(phys_addr_t address, unsigned long size,
	* Little endian		* Little endian
	*/		*/

	#define out_le32(a, v) __raw_writel(__cpu_to_le32(v), (a));		#define out_le32(a, v) __raw_writel(__cpu_to_le32(v), (a))
	#define out_le16(a, v) __raw_writew(__cpu_to_le16(v), (a))		#define out_le16(a, v) __raw_writew(__cpu_to_le16(v), (a))

	#define in_le32(a) __le32_to_cpu(__raw_readl(a))		#define in_le32(a) __le32_to_cpu(__raw_readl(a))