Russell King 938c0ace3f Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable ... Conflicts: arch/arm/mach-pxa/tosa.c		2011-03-26 10:03:03 +00:00
..
arch.h
dma.h
flash.h
irda.h
irq.h
map.h
pci.h
serial_at91.h
serial_sa1100.h
sharpsl_param.h
time.h
udc_pxa2xx.h	ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info	2011-03-16 16:33:34 +08:00