---

yaml --- r: 275555 b: refs/heads/master c: e13b91c h: refs/heads/master i: 275553: b1e8a91 275551: b5a2280 v: v3
git-mirror · Nov 15, 2011 · 37cd02c · 37cd02c
1 parent dd42e6c
commit 37cd02c
Show file tree

Hide file tree

Showing 147 changed files with 811 additions and 926 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 148b00b63a3f747141207e7a409f14bd26d0820f
+refs/heads/master: e13b91c1c47e7be178d2d7914452040ee82c0bd2
diff --git a/trunk/Documentation/sound/alsa/HD-Audio.txt b/trunk/Documentation/sound/alsa/HD-Audio.txt
@@ -579,7 +579,7 @@ Development Tree
 ~~~~~~~~~~~~~~~~
 The latest development codes for HD-audio are found on sound git tree:
 
-- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
+- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
 
 The master branch or for-next branches can be used as the main
 development branches in general while the HD-audio specific patches
@@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make
 install(-modules).  See INSTALL in the package.  The snapshot tarballs
 are found at:
 
-- ftp://ftp.suse.com/pub/people/tiwai/snapshot/
+- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/
 
 
 Sending a Bug Report
@@ -696,7 +696,7 @@ via hda-verb won't change the mixer value.
 
 The hda-verb program is found in the ftp directory:
 
-- ftp://ftp.suse.com/pub/people/tiwai/misc/
+- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
 
 Also a git repository is available:
 
@@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc.
 
 The package is found in:
 
-- ftp://ftp.suse.com/pub/people/tiwai/misc/
+- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
 
 A git repository is available:
 

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1930,7 +1930,6 @@ CONTROL GROUPS (CGROUPS)
 M:	Paul Menage <paul@paulmenage.org>
 M:	Li Zefan <lizf@cn.fujitsu.com>
 L:	containers@lists.linux-foundation.org
-L:	cgroups@vger.kernel.org
 S:	Maintained
 F:	include/linux/cgroup*
 F:	kernel/cgroup*
@@ -4305,7 +4304,6 @@ MEMORY RESOURCE CONTROLLER
 M:	Balbir Singh <bsingharora@gmail.com>
 M:	Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
 M:	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:	cgroups@vger.kernel.org
 L:	linux-mm@kvack.org
 S:	Maintained
 F:	mm/memcontrol.c
@@ -4339,7 +4337,7 @@ MIPS
 M:	Ralf Baechle <ralf@linux-mips.org>
 L:	linux-mips@linux-mips.org
 W:	http://www.linux-mips.org/
-T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git
+T:	git git://git.linux-mips.org/pub/scm/linux.git
 Q:	http://patchwork.linux-mips.org/project/linux-mips/list/
 S:	Supported
 F:	Documentation/mips/

diff --git a/trunk/Makefile b/trunk/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 2
 SUBLEVEL = 0
-EXTRAVERSION = -rc2
+EXTRAVERSION = -rc1
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*

diff --git a/trunk/arch/blackfin/include/asm/bfin_serial.h b/trunk/arch/blackfin/include/asm/bfin_serial.h
@@ -32,8 +32,6 @@ struct work_struct;
 struct bfin_serial_port {
 	struct uart_port port;
 	unsigned int old_status;
-	int tx_irq;
-	int rx_irq;
 	int status_irq;
 #ifndef BFIN_UART_BF54X_STYLE
 	unsigned int lsr;

diff --git a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -372,14 +372,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -420,14 +415,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c b/trunk/arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@ -308,14 +308,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -356,14 +351,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf527/boards/ad7160eval.c b/trunk/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -380,14 +380,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -428,14 +423,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c b/trunk/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -8,7 +8,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -539,14 +538,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -587,14 +581,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -812,6 +801,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
+#include <linux/export.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
 	{BTN_0, GPIO_PF14, 1, "gpio-keys: BTN0"},

diff --git a/trunk/arch/blackfin/mach-bf527/boards/ezbrd.c b/trunk/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/export.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -417,14 +416,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -465,14 +459,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -685,6 +674,7 @@ static struct platform_device bfin_sport1_uart_device = {
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
+#include <linux/export.h>
 
 static struct gpio_keys_button bfin_gpio_keys_table[] = {
 	{BTN_0, GPIO_PG0, 1, "gpio-keys: BTN0"},

diff --git a/trunk/arch/blackfin/mach-bf527/boards/ezkit.c b/trunk/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -710,14 +710,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -758,14 +753,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf527/boards/tll6527m.c b/trunk/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -495,14 +495,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = UART0_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{
@@ -544,14 +539,9 @@ static struct resource bfin_uart1_resources[] = {
 		.end = UART1_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART1_TX,
-		.end = IRQ_UART1_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART1_RX,
-		.end = IRQ_UART1_RX,
+		.end = IRQ_UART1_RX+1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf533/boards/H8606.c b/trunk/arch/blackfin/mach-bf533/boards/H8606.c
@@ -237,14 +237,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = BFIN_UART_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX + 1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf533/boards/blackstamp.c b/trunk/arch/blackfin/mach-bf533/boards/blackstamp.c
@@ -192,14 +192,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = BFIN_UART_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX + 1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{

diff --git a/trunk/arch/blackfin/mach-bf533/boards/cm_bf533.c b/trunk/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -220,14 +220,9 @@ static struct resource bfin_uart0_resources[] = {
 		.end = BFIN_UART_GCTL+2,
 		.flags = IORESOURCE_MEM,
 	},
-	{
-		.start = IRQ_UART0_TX,
-		.end = IRQ_UART0_TX,
-		.flags = IORESOURCE_IRQ,
-	},
 	{
 		.start = IRQ_UART0_RX,
-		.end = IRQ_UART0_RX,
+		.end = IRQ_UART0_RX + 1,
 		.flags = IORESOURCE_IRQ,
 	},
 	{