Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 17:03:00 +0000 (10:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 17:03:00 +0000 (10:03 -0700)
commit7a82323da3d21ea59a0509569fc5c7bc5aa7eed7
treee1831a744561fed3a0316162d702d58fea9c85e9
parentb0d8aa081bcb2d396a257ae5b3be8c1b3006bfa4
parent3c26e17032e42cfbe606882288223ad6146e4c38
Merge git://git./linux/kernel/git/hskinnemoen/avr32-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: some mmc/sd cleanups
  include/video/atmel_lcdc.h must #include <linux/workqueue.h>
  avr32: allow system timer to share interrupt to make OProfile work
  drivers/misc/atmel-ssc.c: Removed duplicated include
  avr32: Add platform data for AC97C platform device
  avr32: clean up mci platform code
  fix avr32 build errors