When a merge does not work automatically, git prevents
[sfrench/cifs-2.6.git] / arch / ppc64 /
drwxr-xr-x   ..
-rw-r--r-- 9825 Kconfig
-rw-r--r-- 1710 Kconfig.debug
-rw-r--r-- 3895 Makefile
drwxr-xr-x - boot
drwxr-xr-x - configs
-rw-r--r-- 28766 defconfig
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - mm
drwxr-xr-x - oprofile
drwxr-xr-x - xmon