Merge branch 'linus' into irq/core, to fix conflict
[sfrench/cifs-2.6.git] / drivers / amba /
drwxr-xr-x   ..
-rw-r--r-- 302 Kconfig
-rw-r--r-- 113 Makefile
-rw-r--r-- 18620 bus.c
-rw-r--r-- 7640 tegra-ahb.c