commit c6d8f400cc7610f04177f81168c19b8407cb48c3
Author: Sergey Lapin <slapin@ossfans.org>
Date:   Thu Jun 12 15:21:55 2008 -0700

    rtc: Ramtron FM3130 RTC support
    
    Ramtron FM3130 is a chip with two separate devices inside, RTC clock and
    FRAM.  This driver provides only RTC functionality.
    
    This chip is met in lots of custom boards with AT91SAMXXXX CPU I work
    with, is cheap and in no way better or worse than any other RTC on market.
     While it is mostly met on much smaller devices, I think it is great to
    have it supported in Linux.
    
    Signed-off-by: Sergey Lapin <slapin@ossfans.org>
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e6d2bb2bacb43ff03b0f458108d71981d58e775a
Author: David Brownell <dbrownell@users.sourceforge.net>
Date:   Thu Jun 12 15:21:55 2008 -0700

    rtc: make HPET_RTC_IRQ track HPET_EMULATE_RTC
    
    More Kconfig tweaks related to the legacy PC RTC code:
    
     - Describe the legacy PC RTC driver as such ... it's never quite
       been clear that this driver is for PC RTCs, and now it's fair
       to call this the "legacy" driver.
    
     - Force it to understand about HPET stealing its IRQs ... kernel
       code does this always when HPET is in use, there should be no
       option for users to goof up the config.
    
    This seems to fix kernel bugzilla #10729.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Maxim Levitsky <maximlevitsky@gmail.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1da2e3d679a8ea2d9e82040359a706da0bd3bef6
Author: Stas Sergeev <stsp@aknet.ru>
Date:   Thu Jun 12 15:21:54 2008 -0700

    provide rtc_cmos platform device
    
    Recently (around 2.6.25) I've noticed that RTC no longer works for me.  It
    turned out this is because I use pnpacpi=off kernel option to work around
    the parport_pc bugs.  I always did so, but RTC used to work fine in the
    past, and now it have regressed.
    
    The patch fixes the problem by creating the platform device for the RTC
    when PNP is disabled.  This may also help running the PNP-enabled kernel
    on an older PCs.
    
    Signed-off-by: Stas Sergeev <stsp@aknet.ru>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Adam Belay <ambx1@neo.rr.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 643b52b9c0b4e959436b4b551ebf4060d06d5ae8
Author: Nick Piggin <nickpiggin@yahoo.com.au>
Date:   Thu Jun 12 15:21:52 2008 -0700

    radix-tree: fix small lockless radix-tree bug
    
    We shrink a radix tree when its root node has only one child, in the left
    most slot.  The child becomes the new root node.  To perform this
    operation in a manner compatible with concurrent lockless lookups, we
    atomically switch the root pointer from the parent to its child.
    
    However a concurrent lockless lookup may now have loaded a pointer to the
    parent (and is presently deciding what to do next).  For this reason, we
    also have to keep the parent node in a valid state after shrinking the
    tree, until the next RCU grace period -- otherwise this lookup with the
    parent pointer may not do the right thing.  Notably, we need to keep the
    child in the left most slot there in case that is requested by the lookup.
    
    This is all pretty standard RCU stuff.  It is worth repeating because in
    my eagerness to obey the radix tree node constructor scheme, I had broken
    it by zeroing the radix tree node before the grace period.
    
    What could happen is that a lookup can load the parent pointer, then
    decide it wants to follow the left most child slot, only to find the slot
    contained NULL due to the concurrent shrinker having zeroed the parent
    node before waiting for a grace period.  The lookup would return a false
    negative as a result.
    
    Fix it by doing that clearing in the RCU callback.  I would normally want
    to rip out the constructor entirely, but radix tree nodes are one of those
    places where they make sense (only few cachelines will be touched soon
    after allocation).
    
    This was never actually found in any lockless pagecache testing or by the
    test harness, but by seeing the odd problem with my scalable vmap rewrite.
     I have not tickled the test harness into reproducing it yet, but I'll
    keep working at it.
    
    Fortunately, it is not a problem anywhere lockless pagecache is used in
    mainline kernels (pagecache probe is not a guarantee, and brd does not
    have concurrent lookups and deletes).
    
    Signed-off-by: Nick Piggin <npiggin@suse.de>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d2187ebd84c7dd13ef269e9600f4daebeb02816e
Author: Jiri Bohac <jbohac@suse.cz>
Date:   Thu Jun 12 15:21:51 2008 -0700

    console keyboard mapping broken by 04c71976
    
    Several console keyboard maps are broken since
    
    commit 04c71976500352d02f60616d2b960267d8c5fe24
    Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Date:   Tue Oct 16 23:27:04 2007 -0700
    
        unicode diacritics support
    
    because that changeset made k_self consider the value as a latin1
    character when in Unicode mode, which is wrong; k_self should still take
    the console map into account.
    
    Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6c826818ff55eae7702b778b5f8bdf765af3b2af
Author: Paul Menage <menage@google.com>
Date:   Thu Jun 12 15:21:49 2008 -0700

    /proc/sysvipc/shm: fix 32-bit truncation of segment sizes
    
    sysvipc_shm_proc_show() picks between format strings (based on the
    expected maximum length of a SHM segment) in a way that prevents gcc from
    performing format checks on the seq_printf() parameters.  This hid two
    format errors - shp->shm_segsz and shp->shm_nattach are both unsigned
    long, but were being printed as unsigned int and signed int respectively.
    This leads to 32-bit truncation of SHM segment sizes reported in
    /proc/sysvipc/shm.  (And for nattach, but that's less of a problem for
    most users).
    
    This patch makes the format string directly visible to gcc's format
    specifier checker, and fixes the two broken format specifiers.
    
    Signed-off-by: Paul Menage <menage@google.com>
    Cc: Nadia Derbey <Nadia.Derbey@bull.net>
    Cc: Manfred Spraul <manfred@colorfullife.com>
    Cc: Pierre Peiffer <peifferp@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bcf8039ed45f56013c4afea5520bca7d909e5e61
Author: Dave Hansen <dave@linux.vnet.ibm.com>
Date:   Thu Jun 12 15:21:48 2008 -0700

    pagemap: fix large pages in pagemap
    
    We were walking right into huge page areas in the pagemap walker, and
    calling the pmds pmd_bad() and clearing them.
    
    That leaked huge pages.  Bad.
    
    This patch at least works around that for now.  It ignores huge pages in
    the pagemap walker for the time being, and won't leak those pages.
    
    Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
    Acked-by: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2165009bdf63f79716a36ad545df14c3cdf958b7
Author: Dave Hansen <dave@linux.vnet.ibm.com>
Date:   Thu Jun 12 15:21:47 2008 -0700

    pagemap: pass mm into pagewalkers
    
    We need this at least for huge page detection for now, because powerpc
    needs the vm_area_struct to be able to determine whether a virtual address
    is referring to a huge page (its pmd_huge() doesn't work).
    
    It might also come in handy for some of the other users.
    
    Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
    Acked-by: Matt Mackall <mpm@selenic.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cfc53f65f56f9f33c0cf522124045ac5a64076b3
Author: Philippe De Muyter <phdm@macqel.be>
Date:   Thu Jun 12 15:21:46 2008 -0700

    driver/char/generic_nvram: fix banner
    
    The generic nvram driver announces itself as
    	'Macintosh non-volatile memory driver'
    instead of 'Generic non-volatile memory driver'.  Fix that.
    
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e59b6a5ab51f6192cbe20d4f031335fe6d0e73fd
Author: Philippe De Muyter <phdm@macqel.be>
Date:   Thu Jun 12 15:21:45 2008 -0700

    drivers/video/cirrusfb: fix RAM address printk
    
    In the cirrusfb driver, the RAM address printk has a superfluous 'x' that
    could be interpreted as "don't care", while it is actually a typo.  Fix
    that.
    
    [akpm@linux-foundation.org: join the two printk strings to make it atomic]
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Cc: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c97aee9ba43d60ff20d955065d29b6d3d8c950d5
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Thu Jun 12 15:21:45 2008 -0700

    intel_rng: make device not found a warning
    
    Since many distros load this driver by default (throw it against the wall
    and see what sticks method).  Change the error message severity level to
    avoid alarming users.  Isn't it annoying when users actually read the
    error logs...
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Cc: Michael Buesch <mb@bu3sch.de>
    Acked-by: Jan Beulich <jbeulich@novell.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 093a44e71aa29157fb1611b00507d67c954099d6
Author: Julia Lawall <julia@diku.dk>
Date:   Thu Jun 12 15:21:43 2008 -0700

    drivers/isdn/sc/ioctl.c: add missing kfree
    
    spid has been allocated in this function and so should be freed before
    leaving it, as in the other error handling cases.
    
    The semantic match that finds the problem is as follows:
    (http://www.emn.fr/x-info/coccinelle/)
    
    @r exists@
    expression E,E1;
    statement S;
    position p1,p2,p3;
    @@
    
    E =@p1 \(kmalloc\|kcalloc\|kzalloc\)(...)
    ... when != E = E1
    if (E == NULL || ...) S
    ... when != E = E1
    if@p2 (...) {
     ... when != kfree(E)
     }
    ... when != E = E1
    kfree@p3(E);
    
    @forall@
    position r.p2;
    expression r.E;
    int E1 != 0;
    @@
    
    * if@p2 (...) {
     ... when != kfree(E)
         when strict
    return E1; }
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Cc: Karsten Keil <kkeil@suse.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cef33400d0349fb24b6f8b7dea79b66e3144fd8b
Author: Chuck Ebbert <cebbert@redhat.com>
Date:   Thu Jun 12 15:21:42 2008 -0700

    mmc: wbsd: initialize tasklets before requesting interrupt
    
    With CONFIG_DEBUG_SHIRQ set we will get an interrupt as soon as we
    allocate one.  Tasklets may be scheduled in the interrupt handler but they
    will be initialized after the handler returns, causing a BUG() in
    kernel/softirq.c when they run.
    
    Should fix this Fedora bug report:
    https://bugzilla.redhat.com/show_bug.cgi?id=449817
    
    Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
    Acked-by: Pierre Ossman <drzeus@drzeus.cx>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 30ec261e5f97986644c0982543bc1cee1b2782bf
Author: Eric Miao <eric.y.miao@gmail.com>
Date:   Thu Jun 12 15:21:41 2008 -0700

    MAINTAINERS: update maintainership of pxa2xx/pxa3xx
    
    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Acked-by: Russell King <rmk@arm.linux.org.uk>
    Acked-by: Nicolas Pitre <nico@marvell.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f1ef9167ca4494a8c6d71d0031c73e9c8841eadd
Author: Jeff Dike <jdike@addtoit.com>
Date:   Thu Jun 12 15:21:41 2008 -0700

    uml: work around broken host PTRACE_SYSEMU
    
    Fedora broke PTRACE_SYSEMU again, and UML crashes as a result when it
    doesn't need to.  This patch makes the PTRACE_SYSEMU check fail gracefully
    and makes UML fall back to PTRACE_SYSCALL.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 14c8a77e1bbd693446dad297d2ae2dd22f187e4f
Author: Jeff Dike <jdike@addtoit.com>
Date:   Thu Jun 12 15:21:40 2008 -0700

    uml: remove include of asm/user.h
    
    I allowed an include of asm/user.h to sneak back in.  This patch replaces
    it with sys/user.h.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 529a4f4ec90ffd9394fdfc22bea7a858ae343171
Author: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date:   Thu Jun 12 15:21:38 2008 -0700

    rtc-at32ap700x: fix bug in at32_rtc_readalarm()
    
    alarm->pending indicates whether there's an alarm that has actually been
    triggered, not whether we're waiting for it.  alarm->enabled indicates
    that.
    
    Also add missing locking around reading the RTC registers.
    
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6c38d8578545482fe45d6e6ea37be02a2e1bb289
Author: Philippe De Muyter <phdm@macqel.be>
Date:   Thu Jun 12 15:21:36 2008 -0700

    m68knommu: init coldfire timer TRR with n - 1, not n
    
    The coldfire timer must be initialised to n - 1 if we want it to count n
    cycles between each tick interrupt.  This was already fixed, but has been
    lost with the conversion to GENERIC_TIMER.
    
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Acked-by: Greg Ungerer <gerg@snapgear.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 67dddaad5d8b8c5ee5b96a7e2f6cb0faad703865
Author: Masami Hiramatsu <mhiramat@redhat.com>
Date:   Thu Jun 12 15:21:35 2008 -0700

    kprobes: fix error checking of batch registration
    
    Fix error checking routine to catch an error which occurs in first
    __register_*probe().
    
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Cc: Jim Keniston <jkenisto@us.ibm.com>
    Cc: David Miller <davem@davemloft.net>
    Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 24aac480e76c6f5d1391ac05c5e9c0eb9b0cd302
Author: Mike Miller <mike.miller@hp.com>
Date:   Thu Jun 12 15:21:34 2008 -0700

    cciss: add new hardware support
    
    Add support for the next generation of HP Smart Array SAS/SATA
    controllers.  Shipping date is late Fall 2008.
    
    Bump the driver version to 3.6.20 to reflect the new hardware support from
    patch 1 of this set.
    
    Signed-off-by: Mike Miller <mike.miller@hp.com>
    Cc: Jens Axboe <jens.axboe@oracle.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8cdbc2b9826b3543fecff2f6d6400fa77b21ffdd
Author: Andrew G. Morgan <morgan@kernel.org>
Date:   Thu Jun 12 15:21:33 2008 -0700

    capabilities: add (back) dummy support for KEEPCAPS
    
    The dummy module is used by folk that run security conscious code(!?).  A
    feature of such code (for example, dhclient) is that it tries to operate
    with minimum privilege (dropping unneeded capabilities).  While the dummy
    module doesn't restrict code execution based on capability state, the user
    code expects the kernel to appear to support it.  This patch adds back
    faked support for the PR_SET_KEEPCAPS etc., calls - making the kernel
    behave as before 2.6.26.
    
    For details see: http://bugzilla.kernel.org/show_bug.cgi?id=10748
    
    Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Stephen Smalley <sds@tycho.nsa.gov>
    Cc: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 57d3c64fd8130ebdacd85a36c9656ba5e221f3a3
Author: Ben Nizette <bn@niasdigital.com>
Date:   Thu Jun 12 15:21:31 2008 -0700

    proc_fs.h: move struct mm_struct forward-declaration
    
    Move the forward-declaration of struct mm_struct a little way up
    proc_fs.h.  This fixes a bunch of "'struct mm_struct' declared inside
    parameter list" warnings with CONFIG_PROC_FS=n
    
    Signed-off-by: Ben Nizette <bn@niasdigital.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 551e172a20cf960f7caab4d31b252dc59538bfa4
Author: Paul Jackson <pj@sgi.com>
Date:   Thu Jun 12 15:21:31 2008 -0700

    cpusets: provide another web page URL in MAINTAINERS file
    
    Add URL for another CPUSETS web page to the MAINTAINERS file.
    
    This URL provides links to major LGPL user level C libraries supporting
    cpuset usage and user level cpu and node masks.
    
    Signed-off-by: Paul Jackson <pj@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 630c270183133ac25bef8c8d726ac448df9b169a
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Thu Jun 12 15:21:29 2008 -0700

    hgafb: resource management fix
    
    Release ports which are requested during detection which are not freed if
    there is no hga card.  Otherwise there is a crash during cat /proc/ioports
    command.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 69c5ddf58a03da3686691ad2f293bc79fd977c10
Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Date:   Thu Jun 12 15:21:29 2008 -0700

    m68k: Add ext2_find_{first,next}_bit() for ext4
    
    Add ext2_find_{first,next}_bit(), which are needed for ext4.  They're
    derived out of the ext2_find_next_zero_bit found in the same file.
    Compile tested with crosstools
    
    [Reworked to preserve all symmetry with ext2_find_{first,next}_zero_bit()]
    
    This fixes http://bugzilla.kernel.org/show_bug.cgi?id=10393
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2d518f84e5ecd1d71df0e6ac5176d212f68c27ce
Author: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date:   Thu Jun 12 15:21:28 2008 -0700

    fat: relax the permission check of fat_setattr()
    
    New chmod() allows only acceptable permission, and if not acceptable, it
    returns -EPERM.  Old one allows even if it can't store permission to on
    disk inode.  But it seems too strict for users.
    
    E.g.  https://bugzilla.redhat.com/show_bug.cgi?id=449080: With new one,
    rsync couldn't create the temporary file.
    
    So, this patch allows like old one, but now it doesn't change the
    permission if it can't store, and it returns 0.
    
    Also, this patch fixes missing check.
    
    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c700be3d1320d2be4f04c8a5330186b7df724438
Author: kosaki.motohiro@jp.fujitsu.com <kosaki.motohiro@jp.fujitsu.com>
Date:   Thu Jun 12 15:21:27 2008 -0700

    mm: fix incorrect variable type in do_try_to_free_pages()
    
    "Smarter retry of costly-order allocations" patch series change behaver of
    do_try_to_free_pages().  But unfortunately ret variable type was
    unchanged.
    
    Thus an overflow is possible.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Nishanth Aravamudan <nacc@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit df0bcab2c66ac876d5e80864fca5cce944a44540
Author: Amit Kucheria <amit.kucheria@ubuntu.com>
Date:   Thu Jun 12 15:21:26 2008 -0700

    agp: add support for Radeon Mobility 9000 chipset
    
    Addresses https://bugs.edge.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/178634
    
    Signed-off-by: Amit Kucheria <amit.kucheria@ubuntu.com>
    Signed-off-by: maximilian attems <max@stro.at>
    Acked-by: Dave Airlie <airlied@linux.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>