commit b620cc2cd80393b9a0f9a76806cb7f9e91671dac tree 6291cc977570bfbdd209fb55602806b8f4cd8d11 parent 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 parent 31f919c3296a30427b18458b13c308513a62c3b9 author Linus Torvalds Sat, 01 Oct 2005 17:02:13 -0700 committer Linus Torvalds Sat, 01 Oct 2005 17:02:13 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 tree 90ac70029802d5730a36a0bd8a092a97721605b8 parent 14bfd1ff94f519a59b1e88e682819332d7e98171 author Sven Henkel Sun, 02 Oct 2005 08:30:33 +1000 committer Linus Torvalds Sat, 01 Oct 2005 17:01:48 -0700 [PATCH] ppc32: Add new iBook 12" to PowerMac models table This adds the new iBook G4 (manufactured after July 2005) to the PowerMac models table. The model name (PowerBook6,7) is taken from a 12" iBook, I don't know if it also matches the 14" version. The patch applies to a vanilla 2.6.13.2 kernel. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 14bfd1ff94f519a59b1e88e682819332d7e98171 tree a93505ba7f7983e529b3cf19670cfc1b1af75fc7 parent 14bf01bb0599c89fc7f426d20353b76e12555308 author Sven Henkel Sun, 02 Oct 2005 08:29:18 +1000 committer Linus Torvalds Sat, 01 Oct 2005 17:01:48 -0700 [PATCH] pmac/radeonfb: Add suspend support for M11 chip in new iBook 12" This adds suspend support for the Radeon M11 chip in 12" iBooks manufactured after July 2005. I don't know if the new 14" iBooks also have that chip, so they might also be supported. The chip identifies itself as "RV350 NV" (pci id 0x4e56), revision 0x80. Apple calls it "Snowy", xfree86 names it "ATI FireGL Mobility T2 (M11) NV (AGP)". So, we seem to be lucky here: The suspend-code for the M10 (which also is a "RV350 NV") works flawless for that chip. Signed-off-by: Sven Henkel Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit 31f919c3296a30427b18458b13c308513a62c3b9 tree 2c803a5b61b8559bd18ae69b01031fe74e5fe4c0 parent 9f4426dde2be352aabc326539eccc726cea2d98c author Vincent Sanders Sat, 01 Oct 2005 22:56:34 +0100 committer Russell King Sat, 01 Oct 2005 22:56:34 +0100 [ARM] 2945/1: ARM fortunet fails to build because of missing include Patch from Vincent Sanders When building the fortunet ARM platform it fails to compile because of missing include. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 9f4426dde2be352aabc326539eccc726cea2d98c tree a36e6d4f5b808e74c3701572168a85e7b6403a45 parent f0e837d9182d7903bde3ebafbd1d0d68c6d32d43 author Vincent Sanders Sat, 01 Oct 2005 22:56:34 +0100 committer Russell King Sat, 01 Oct 2005 22:56:34 +0100 [ARM] 2944/1: GCC 4 mx1ads serial driver compile fix Patch from Vincent Sanders When building the mx1ads ARM platforms the serial driver fails to compile with GCC 4.01 due to extern/static ambiguity. Signed-off-by: Vincent Sanders Signed-off-by: Russell King commit 14bf01bb0599c89fc7f426d20353b76e12555308 tree 4d9c164faaff5df25044b15afa235debc96091dc parent fd2e54b35bd70d11c160ded4834e2378e915356e author Linus Torvalds Sat, 01 Oct 2005 11:04:18 -0700 committer Linus Torvalds Sat, 01 Oct 2005 11:04:18 -0700 Fix inequality comparison against "task->state" We should always use bitmask ops, rather than depend on some ordering of the different states. With the TASK_NONINTERACTIVE flag, the inequality doesn't really work. Oleg Nesterov argues (likely correctly) that this test is unnecessary in the first place. However, the minimal fix for now is to at least make it work in the presense of TASK_NONINTERACTIVE. Waiting for consensus from Roland & co on potential bigger cleanups. Signed-off-by: Linus Torvalds commit fd2e54b35bd70d11c160ded4834e2378e915356e tree 6396bae6e445cc732ace9792018a14ece9274b0f parent 2d8ab6ad6edf0e8709da9ad24e3f023503f76cee author Diego Calleja Sat, 01 Oct 2005 17:00:48 +0200 committer Linus Torvalds Sat, 01 Oct 2005 10:54:47 -0700 [PATCH] trivial #if -> #ifdef Use '#ifdef' consistently on __KERNEL__. This was reported as bug #5340 (isn't easier to send a fix than report the bug?!) Signed-off-by: Diego Calleja Signed-off-by: Linus Torvalds commit 2d8ab6ad6edf0e8709da9ad24e3f023503f76cee tree ba5f06ad6f77c199f9f7d79493013dbdebf2ba6c parent 702c96d55059b4a8e5b1eb112ee3b1804708a1bd author Ananth N Mavinakayanahalli Sat, 01 Oct 2005 13:14:17 -0400 committer Linus Torvalds Sat, 01 Oct 2005 10:54:47 -0700 [PATCH] ppc64: fix up()/down() usage for kprobe_mutex The incorrect kprobe_mutex usage on x86_64 had percolated to ppc64 too. First noticed by Yanmin Zhang. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Linus Torvalds commit 702c96d55059b4a8e5b1eb112ee3b1804708a1bd tree 21783503ba16539d1e0d9d0b53edf97266382daf parent f0e837d9182d7903bde3ebafbd1d0d68c6d32d43 author Deepak Saxena Fri, 30 Sep 2005 16:20:22 -0700 committer Linus Torvalds Fri, 30 Sep 2005 23:04:20 -0700 [PATCH] ARM: Fix IXP2000 serial port resource range. For real this time. Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena [ diff went missing first time due to corrupted patch ] Signed-off-by: Linus Torvalds commit f0e837d9182d7903bde3ebafbd1d0d68c6d32d43 tree a36abbed986e1d803efafd662ec3d65361f02853 parent a9487e48a34d7ad606f40a76080475a522a27cff author Francois Romieu Fri, 30 Sep 2005 16:54:02 -0700 committer Linus Torvalds Fri, 30 Sep 2005 17:20:21 -0700 [PATCH] r8169: tone down the r8169 driver Tone down the r8169 driver As an alternative, people can use the boot time 'debug' option and/or use 'ethtool -s ethX msglvl xyz'. The different messages are listed at: http://www.zoreil.com/~romieu/r8169/doc/msglvl.txt Signed-off-by: Francois Romieu Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9487e48a34d7ad606f40a76080475a522a27cff tree a4fa93c9088781ae4ece9a5e60e8ecb9b63d960f parent 69d37960b578be0a69383bd71d06c1fcfb86e8b9 author Benjamin Herrenschmidt Sat, 01 Oct 2005 09:21:25 +1000 committer Linus Torvalds Fri, 30 Sep 2005 17:20:20 -0700 [PATCH] pmac: fix cpufreq for old tipb 550Mhz The old 550Mhz titanium powerbook can switch to a lower frequency (500Mhz). A user has been repeately reporting overtemp conditions on his machine at high speed so this simple patch adds support to PowerMac cpufreq for this machine. The difference in frequency isn't big but seem enough to fix that user's problems. The patch has been around for some time now and doesn't seem to cause any problem, so I suppose it could go in now. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Alain RICHARD Signed-off-by: Linus Torvalds commit 69d37960b578be0a69383bd71d06c1fcfb86e8b9 tree 1041e0ea3650a74d5b1fc730cd7b697d0eed5d01 parent 1c9426e8a59461688bb451e006456987b198e4c0 author Deepak Saxena Fri, 30 Sep 2005 16:20:22 -0700 committer Linus Torvalds Fri, 30 Sep 2005 17:20:20 -0700 [PATCH] Fix IXP2000 serial port resource range Serial port only needs 32 bytes of resource space but we are currently asking for 64K. Signed-off-by: Deepak Saxena Signed-off-by: Linus Torvalds