1. 06 Jun, 2007 3 commits
  2. 13 May, 2007 5 commits
    • Gabriel Mansi's avatar
      [AGPGART] Fix wrong ID in via-agp.c · bbdfff86
      Gabriel Mansi authored
      there is a wrong id in drivers/char/agp/via-agp.c
      #define PCI_DEVICE_ID_VIA_CX700         0x8324
      It must be 0x0324
      
      Notice that PCI_DEVICE_ID_VIA_CX700 is also used in
      drivers/i2c/busses/i2c-viapro.c and
      drivers/ide/pci/via82cxxx.c
      
      So, I think that constant must be renamed to avoid conflicting.
      I attached a proposed patch.
      Signed-off-by: default avatarDave Jones <davej@redhat.com>
      bbdfff86
    • Al Viro's avatar
      fix deadlock in loop.c · 705962cc
      Al Viro authored
      ... doh
      
      Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but
      cause lockdep to complain.
      
      Ouch.  OK, the deadlock is real and yes, I'm an idiot.  Speaking of which,
      we probably want to s/lock/pin/ in drivers/base/map.c to avoid such
      brainos again.  And yes, this stuff needs clear documentation.  Will try
      to put one together once I get some sleep...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: Jeremy Fitzhardinge <jeremy@goop.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      705962cc
    • Linus Torvalds's avatar
      Linux 2.6.22-rc1 · 39403865
      Linus Torvalds authored
      .. close the merge window
      39403865
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · f7d02ae7
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
        [ARM] Use new get_irqnr_preamble
        [ARM] Ensure machine class menu is sorted alphabetically
        [ARM] 4333/2: KS8695: Micrel Development board
        [ARM] 4332/2: KS8695: Serial driver
        [ARM] 4331/3: Support for Micrel/Kendin KS8695 processor
        [ARM] 4371/1: AT91: Support for Atmel AT91SAM9RL-EK development board
        [ARM] 4372/1: Define byte sizes in asm-arm/sizes.h
        [ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.
        [ARM] Update mach-types
        [ARM] export symbol csum_partial_copy_from_user
        [ARM] iop13xx: msi support
        [ARM] stacktrace fix
        [ARM] Spinlock initializer cleanup
        [ARM] remove useless config option GENERIC_BUST_SPINLOCK
        [ARM] 4303/3: base kernel support for TI DaVinci
        [ARM] 4369/1: AT91: Fix circular dependency in header files
        [ARM] 4368/1: S3C24xx: build fix
        [ARM] 4364/1: AT91: LEDS on AT91SAM9261-EK
        [ARM] Fix iop32x/iop33x build
        [ARM] EBSA110: fix build errors caused by missing "const"
        ...
      f7d02ae7
    • Daniel Walker's avatar
      include/linux: trivial repair whitespace damage · 78db2ad6
      Daniel Walker authored
      Adding tabs where spaces currently are.
      Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      78db2ad6
  3. 12 May, 2007 32 commits