| commit | 7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 27 10:03:00 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 27 10:03:00 2008 -0700 |
| tree | e1831a744561fed3a0316162d702d58fea9c85e9 | |
| parent | b0d8aa081bcb2d396a257ae5b3be8c1b3006bfa4 [diff] | |
| parent | 3c26e17032e42cfbe606882288223ad6146e4c38 [diff] |
Merge git://git.kernel.org/pub/scm/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