[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / include / asm-avr32 / gpio.h
2007-02-11  Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-09  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09  Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-02-09  Linus TorvaldsMerge branch 'for-linus' of git://atmel.no/~hskinnemoen...
2007-02-09  Haavard Skinnemoen[AVR32] GPIO API implementation