Merge by hand (conflicts in sr.c)
[linux-2.6/linux-loongson.git] / arch / ppc64 / 
treef05160da48e72008766bbe06440a5fcab1b06a12
drwxr-xr-x   ..
-rw-r--r-- 11121 Kconfig
-rw-r--r-- 1710 Kconfig.debug
-rw-r--r-- 3968 Makefile
drwxr-xr-x - boot
drwxr-xr-x - configs
-rw-r--r-- 29056 defconfig
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - mm
drwxr-xr-x - oprofile
drwxr-xr-x - xmon