Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
  [media] rc: update for bitop name changes
  fs: simplify iget & friends
  fs: pull inode->i_lock up out of writeback_single_inode
  fs: rename inode_lock to inode_hash_lock
  fs: move i_wb_list out from under inode_lock
  fs: move i_sb_list out from under inode_lock
  fs: remove inode_lock from iput_final and prune_icache
  fs: Lock the inode LRU list separately
  fs: factor inode disposal
  fs: protect inode->i_state with inode->i_lock
  lib, arch: add filter argument to show_mem and fix private implementations
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath
  autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
  autofs4 - remove autofs4_lock
  autofs4 - fix d_manage() return on rcu-walk
  autofs4 - fix autofs4_expire_indirect() traversal
  autofs4 - fix dentry leak in autofs4_expire_direct()
  autofs4 - reinstate last used update on access
  vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
  ...

NOTE!

This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.

To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.

In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.

1 files changed, 73 insertions, 0 deletions

diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig
new file mode 100644
index 000000000000..2c20a341c11a
--- /dev/null
+++ b/arch/arm/mach-vt8500/Kconfig
@@ -0,0 +1,73 @@
+if ARCH_VT8500
+
+config VTWM_VERSION_VT8500
+        bool
+
+config VTWM_VERSION_WM8505
+        bool
+
+config MACH_BV07
+        bool "Benign BV07-8500 Mini Netbook"
+        depends on ARCH_VT8500
+        select VTWM_VERSION_VT8500
+        help
+          Add support for the inexpensive 7-inch netbooks sold by many
+          Chinese distributors under various names. Note that there are
+          many hardware implementations in identical exterior, make sure
+          that yours is indeed based on a VIA VT8500 chip.
+
+config MACH_WM8505_7IN_NETBOOK
+        bool "WM8505 7-inch generic netbook"
+        depends on ARCH_VT8500
+        select VTWM_VERSION_WM8505
+        help
+          Add support for the inexpensive 7-inch netbooks sold by many
+          Chinese distributors under various names. Note that there are
+          many hardware implementations in identical exterior, make sure
+          that yours is indeed based on a WonderMedia WM8505 chip.
+
+comment "LCD panel size"
+
+config WMT_PANEL_800X480
+        bool "7-inch with 800x480 resolution"
+        depends on (FB_VT8500 || FB_WM8505)
+        default y
+        help
+          These are found in most of the netbooks in generic cases, as
+          well as in Eken M001 tablets and possibly elsewhere.
+
+          To select this panel at runtime, say y here and append
+          'panel=800x480' to your kernel command line. Otherwise, the
+          largest one available will be used.
+
+config WMT_PANEL_800X600
+        bool "8-inch with 800x600 resolution"
+        depends on (FB_VT8500 || FB_WM8505)
+        help
+          These are found in Eken M003 tablets and possibly elsewhere.
+
+          To select this panel at runtime, say y here and append
+          'panel=800x600' to your kernel command line. Otherwise, the
+          largest one available will be used.
+
+config WMT_PANEL_1024X576
+        bool "10-inch with 1024x576 resolution"
+        depends on (FB_VT8500 || FB_WM8505)
+        help
+          These are found in CherryPal netbooks and possibly elsewhere.
+
+          To select this panel at runtime, say y here and append
+          'panel=1024x576' to your kernel command line. Otherwise, the
+          largest one available will be used.
+
+config WMT_PANEL_1024X600
+        bool "10-inch with 1024x600 resolution"
+        depends on (FB_VT8500 || FB_WM8505)
+        help
+          These are found in Eken M006 tablets and possibly elsewhere.
+
+          To select this panel at runtime, say y here and append
+          'panel=1024x600' to your kernel command line. Otherwise, the
+          largest one available will be used.
+
+endif