Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  [AVR32] Export intc_get_pending symbol
  [AVR32] Add missing bit in PCCR sysreg
  [AVR32] Fix duplicate clock index in at32ap machine code
  [AVR32] remove UID16 option
  [AVR32] Turn off debugging in SMC driver
  Extend I/O resource for wdt0 for at32ap7000 devices
  [AVR32] pcmcia ioaddr_t should be 32 bits on AVR32

...

This commit is contained in:

Linus Torvalds 2007-11-15 08:37:09 -08:00

parent d32ddd8f20 597702aeb4

commit 8cc91677ae

6 changed files with 8 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/avr32/Kconfig

View file

4

arch/avr32/mach-at32ap/at32ap7000.c

View file

1

arch/avr32/mach-at32ap/hsmc.c

View file

4

arch/avr32/mach-at32ap/intc.c

View file

2

include/asm-avr32/sysreg.h

View file

2

include/pcmcia/cs_types.h

View file