[IA64] Manual merge fix for 3 files
[sfrench/cifs-2.6.git] / arch / sparc64 /
drwxr-xr-x   ..
-rw-r--r-- 10467 Kconfig
-rw-r--r-- 1316 Kconfig.debug
-rw-r--r-- 2367 Makefile
drwxr-xr-x - boot
-rw-r--r-- 38319 defconfig
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - math-emu
drwxr-xr-x - mm
drwxr-xr-x - oprofile
drwxr-xr-x - prom
drwxr-xr-x - solaris