Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull uaccess.h prepwork from Al Viro:
 "Preparations to tree-wide switch to use of linux/uaccess.h (which,
  obviously, will allow to start unifying stuff for real). The last step
  there, ie

    PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
    sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
            `git grep -l "$PATT"|grep -v ^include/linux/uaccess.h`

  is not taken here - I would prefer to do it once just before or just
  after -rc1.  However, everything should be ready for it"

* 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  remove a stray reference to asm/uaccess.h in docs
  sparc64: separate extable_64.h, switch elf_64.h to it
  score: separate extable.h, switch module.h to it
  mips: separate extable.h, switch module.h to it
  x86: separate extable.h, switch sections.h to it
  remove stray include of asm/uaccess.h from cacheflush.h
  mn10300: remove a bogus processor.h->uaccess.h include
  xtensa: split uaccess.h into C and asm sides
  bonding: quit messing with IOCTL
  kill __kernel_ds_p off
  mn10300: finish verify_area() off
  frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h
  exceptions: detritus removal

diff --cc arch/x86/mm/fault.c
index 4dc13340653eb96d1e550b1a10b4635babba79b4,c0413d5541af7a3a27dcf2f7137c2b8b4013b988..9f72ca3b2669a62f5d512a01367d7af16a5e1ba3
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -5,7 -5,7 +5,7 @@@
   */
  #include <linux/sched.h>              /* test_thread_flag(), ...      */
  #include <linux/kdebug.h>             /* oops_begin/end, ...          */
- #include <linux/extable.h>            /* search_exception_table       */
 -#include <linux/module.h>             /* search_exception_tables      */
++#include <linux/extable.h>            /* search_exception_tables      */
  #include <linux/bootmem.h>            /* max_low_pfn                  */
  #include <linux/kprobes.h>            /* NOKPROBE_SYMBOL, ...         */
  #include <linux/mmiotrace.h>          /* kmmio_handler, ...           */

diff --cc arch/xtensa/kernel/entry.S
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge