Merge commit 'v2.6.30-rc1' into perfcounters/core

Conflicts:
	arch/powerpc/include/asm/systbl.h
	arch/powerpc/include/asm/unistd.h
	include/linux/init_task.h

Merge reason: the conflicts are non-trivial: PowerPC placement
              of sys_perf_counter_open has to be mixed with the
	      new preadv/pwrite syscalls.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e7b8aa0cb47c..ddea8e485cc9 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -410,6 +410,23 @@ config ATA_OVER_ETH
         This driver provides Support for ATA over Ethernet block
         devices like the Coraid EtherDrive (R) Storage Blade.
 
+config MG_DISK
+        tristate "mGine mflash, gflash support"
+        depends on ARM && ATA && GPIOLIB
+        help
+          mGine mFlash(gFlash) block device driver
+
+config MG_DISK_RES
+        int "Size of reserved area before MBR"
+        depends on MG_DISK
+        default 0
+        help
+          Define size of reserved area that usually used for boot. Unit is KB.
+          All of the block device operation will be taken this value as start
+          offset
+          Examples:
+                        1024 => 1 MB
+
 config SUNVDC
         tristate "Sun Virtual Disk Client support"
         depends on SUN_LDOMS