1. 21 Feb, 2007 32 commits
  2. 20 Feb, 2007 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · e696268a
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT
        [ARM] Fix s3c2410 ALSA audio for typedef elimination
        [ARM] Fix ARM AACI ALSA driver
        [ARM] fix mach-at91 build breakage
        [ARM] Fix jornada720 build errors
        [ARM] Fix iop13xx build error
        [ARM] Fix build error caused by move of apm
        [ARM] 4223/1: ixdp2351 : Fix for a define error
        [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx
        [ARM] 4186/1: iop: remove cp6_enable/disable routines
        [ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user
      e696268a
    • Russell King's avatar
      Merge ARM fixes · 5a84d159
      Russell King authored
      5a84d159
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 91aa6931
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (21 commits)
        natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards
        natsemi: Add support for using MII port with no PHY
        skge: race with workq and RTNL
        Replace local random function with random32()
        s2io: RTNL and flush_scheduled_work deadlock
        8139too: RTNL and flush_scheduled_work deadlock
        sis190: RTNL and flush_scheduled_work deadlock
        r8169: RTNL and flush_scheduled_work deadlock
        [PATCH] ieee80211softmac: Fix setting of initial transmit rates
        [PATCH] bcm43xx: OFDM fix for rev 1 cards
        [PATCH] bcm43xx: Fix for 4311 and 02/07/07 specification changes
        [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths
        [PATCH] zd1211rw: Readd zd_addr_t cast
        [PATCH] bcm43xx: Fix for oops on resume
        [PATCH] bcm43xx: Ignore ampdu status reports
        [PATCH] wavelan: Use ARRAY_SIZE macro when appropriate
        [PATCH] hostap: Use ARRAY_SIZE macro when appropriate
        [PATCH] misc-wireless: Use ARRAY_SIZE macro when appropriate
        [PATCH] ipw2100: Use ARRAY_SIZE macro when appropriate
        [PATCH] bcm43xx: Janitorial change - remove two unused variables
        ...
      91aa6931
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight · a5527c6a
      Linus Torvalds authored
      * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
        backlight: Remove bogus SYSFS dependency
        backlight: simplify corgi_bl locking
        backlight: Separate backlight properties from backlight ops pointers
        backlight: Clean up pmac_backlight handling
        backlight: Improve backlight selection for fbdev drivers
        backlight: Rework backlight/fb interaction simplifying, lots
        backlight: Remove unneeded backlight update_status calls
        backlight: Remove uneeded update_status call from chipsfb.c
        backlight/fbcon: Add FB_EVENT_CONBLANK
        backlight: Fix Kconfig entries
        backlight: Remove uneeded nvidia set_power calls
        backlight: Convert semaphore -> mutex
        backlight: Fix external uses of backlight internal semaphore
        backlight: Minor code cleanups for hp680_bl.c
        backlight: Minor code cleanups for corgi_bl.c
        backlight: Remove excessive (un)likelys
        backlight: Remove unneeded owner field
        backlight: Fix error handling
        backlight: Add Frontpath ProGear HX1050+ driver
        backlight: Add maintainer entry
      a5527c6a
    • David Brownell's avatar
      [PATCH] ARM: fix mach-at91 build breakage · 4afffe5e
      David Brownell authored
      The rename of the AT91 subtree from mach-at91rm9200 to mach-at91
      (to accomodate at91sam926x processors) was incomplete.  It needs
      this patch to be able to build again.
      Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4afffe5e
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · d7f786e0
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]
        [MIPS] Drop __init from init_8259A()
        [MIPS] Fix Kconfig typo bug
        [MIPS] Fix double signal on trap and break instruction
        [MIPS] sigset_32 has been made redundand by compat_sigset_t.
        [MIPS] emma2rh: Remove needless <asm/i8259.h> inclusion.
        [MIPS] Add MTD device support for Cobalt
      d7f786e0
    • Geert Uytterhoeven's avatar
      [PATCH] tty_register_driver: Remove incorrect and superfluous cast · e5717c48
      Geert Uytterhoeven authored
      tty_register_driver: Remove incorrect and superfluous cast (expected and passed
      types are both const char *)
      Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
      Acked-by: default avatarAlan Cox <alan@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e5717c48
    • Dale Farnsworth's avatar
      [NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012] · f00a3ec4
      Dale Farnsworth authored
      Remove the use of CONFIG_MV643XX_ETH_[012] variables on most platforms.
      Instead, platform-specific code enables the ports supported by the
      hardware.  After this patch, these config variables are only used in
      arch/ppc, so also move them from drivers/net/Kconfig to arch/ppc/Kconfig.
      Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Acked-by: default avatarJeff Garzik <jeff@garzik.org>
      Cc: Paul Mackerras <paulus@samba.org>
      f00a3ec4