Next/merge.log

   1 $ date
   2 Tue Jun  7 10:00:07 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 0792644 Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
   7 Merging origin/master
   8 $ git merge origin/master
   9 Updating 0792644..59c5f46
  10 Fast-forward
  11  Makefile                     |    2 +-
  12  drivers/hwmon/coretemp.c     |   23 ++++-------------------
  13  drivers/hwmon/max6642.c      |   22 ++++++++++++++++++----
  14  mm/hugetlb.c                 |    4 ++--
  15  sound/pci/asihpi/hpidspcd.c  |    2 +-
  16  sound/pci/fm801.c            |   13 +++++++++++--
  17  sound/pci/hda/patch_analog.c |   16 ++++++++--------
  18  sound/soc/codecs/wm_hubs.c   |    8 ++++----
  19  sound/soc/soc-dapm.c         |    5 ++++-
  20  sound/usb/6fire/firmware.c   |    1 +
  21  sound/usb/quirks.c           |    2 +-
  22  11 files changed, 55 insertions(+), 43 deletions(-)
  23 Merging fixes/fixes
  24 $ git merge fixes/fixes
  25 Already up-to-date.
  26 Merging kbuild-current/rc-fixes
  27 $ git merge kbuild-current/rc-fixes
  28 Already up-to-date.
  29 Merging arm-current/master
  30 $ git merge arm-current/master
  31 Already up-to-date.
  32 Merging m68k-current/for-linus
  33 $ git merge m68k-current/for-linus
  34 Already up-to-date.
  35 Merging powerpc-merge/merge
  36 $ git merge powerpc-merge/merge
  37 Already up-to-date.
  38 Merging 52xx-and-virtex-current/powerpc/merge
  39 $ git merge 52xx-and-virtex-current/powerpc/merge
  40 Already up-to-date.
  41 Merging sparc-current/master
  42 $ git merge sparc-current/master
  43 Merge made by recursive.
  44  arch/sparc/Kconfig                  |   18 +-
  45  arch/sparc/include/asm/leon.h       |    3 +
  46  arch/sparc/include/asm/leon_pci.h   |   21 +
  47  arch/sparc/include/asm/pci_32.h     |   24 +
  48  arch/sparc/include/asm/pcic.h       |    2 +-
  49  arch/sparc/kernel/Makefile          |    4 +-
  50  arch/sparc/kernel/entry.S           |    4 +-
  51  arch/sparc/kernel/leon_kernel.c     |   15 +
  52  arch/sparc/kernel/leon_pci.c        |  253 ++++++++++
  53  arch/sparc/kernel/leon_pci_grpci2.c |  897 +++++++++++++++++++++++++++++++++++
  54  drivers/pci/Makefile                |    1 +
  55  11 files changed, 1237 insertions(+), 5 deletions(-)
  56  create mode 100644 arch/sparc/include/asm/leon_pci.h
  57  create mode 100644 arch/sparc/kernel/leon_pci.c
  58  create mode 100644 arch/sparc/kernel/leon_pci_grpci2.c
  59 Merging scsi-rc-fixes/master
  60 $ git merge scsi-rc-fixes/master
  61 Already up-to-date.
  62 Merging net-current/master
  63 $ git merge net-current/master
  64 Merge made by recursive.
  65  drivers/net/bonding/bond_main.c                |   11 ++++
  66  drivers/net/qlcnic/qlcnic_hw.c                 |    1 +
  67  drivers/net/qlcnic/qlcnic_main.c               |    1 +
  68  drivers/net/smc91x.c                           |    6 +-
  69  drivers/net/wireless/ath/ath5k/base.c          |   11 +++-
  70  drivers/net/wireless/ath/ath5k/reset.c         |    5 +-
  71  drivers/net/wireless/iwlwifi/iwl-2000.c        |   74 ------------------------
  72  drivers/net/wireless/iwlwifi/iwl-5000.c        |    2 -
  73  drivers/net/wireless/iwlwifi/iwl-6000.c        |    2 -
  74  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c    |    6 +-
  75  drivers/net/wireless/iwlwifi/iwl-agn.c         |   19 +++---
  76  drivers/net/wireless/iwlwifi/iwl-core.c        |    6 +--
  77  drivers/net/wireless/iwlwifi/iwl-core.h        |    1 +
  78  drivers/net/wireless/iwlwifi/iwl-dev.h         |   13 +----
  79  drivers/net/wireless/iwlwifi/iwl-rx.c          |   24 ++++----
  80  drivers/net/wireless/libertas/if_sdio.c        |   21 +++++--
  81  drivers/ssb/driver_pcicore.c                   |   10 ++-
  82  include/linux/netdevice.h                      |    2 +-
  83  include/linux/netfilter/nf_conntrack_common.h  |    3 +
  84  net/core/dev.c                                 |   16 ++----
  85  net/core/net_namespace.c                       |   16 ++---
  86  net/ipv4/netfilter/ip_queue.c                  |    3 +-
  87  net/ipv4/netfilter/ipt_CLUSTERIP.c             |    6 +-
  88  net/ipv4/netfilter/ipt_MASQUERADE.c            |    2 +-
  89  net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |    2 +-
  90  net/ipv4/netfilter/nf_conntrack_proto_icmp.c   |    2 +-
  91  net/ipv4/netfilter/nf_nat_core.c               |    2 +-
  92  net/ipv4/netfilter/nf_nat_helper.c             |    2 +-
  93  net/ipv4/netfilter/nf_nat_rule.c               |    2 +-
  94  net/ipv4/netfilter/nf_nat_standalone.c         |    4 +-
  95  net/ipv6/af_inet6.c                            |    4 +
  96  net/ipv6/netfilter/ip6_queue.c                 |    3 +-
  97  net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    2 +-
  98  net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c |    2 +-
  99  net/l2tp/l2tp_debugfs.c                        |    2 +-
 100  net/mac80211/iface.c                           |    4 +
 101  net/netfilter/ipset/ip_set_core.c              |    2 +-
 102  net/netfilter/ipset/ip_set_hash_ipportnet.c    |   10 ++-
 103  net/netfilter/ipset/ip_set_hash_net.c          |    8 ++-
 104  net/netfilter/ipset/ip_set_hash_netport.c      |    6 +-
 105  net/netfilter/ipvs/ip_vs_core.c                |   16 +++---
 106  net/netfilter/nf_conntrack_core.c              |    7 ++-
 107  net/netfilter/nf_conntrack_ftp.c               |    2 +-
 108  net/netfilter/nf_conntrack_h323_main.c         |   10 +--
 109  net/netfilter/nf_conntrack_irc.c               |    3 +-
 110  net/netfilter/nf_conntrack_pptp.c              |    3 +-
 111  net/netfilter/nf_conntrack_sane.c              |    2 +-
 112  net/netfilter/nf_conntrack_sip.c               |    2 +-
 113  net/netfilter/xt_socket.c                      |    4 +-
 114  net/sched/sch_generic.c                        |    3 +-
 115  50 files changed, 164 insertions(+), 206 deletions(-)
 116 Merging sound-current/for-linus
 117 $ git merge sound-current/for-linus
 118 Already up-to-date.
 119 Merging pci-current/for-linus
 120 $ git merge pci-current/for-linus
 121 Merge made by recursive.
 122  arch/x86/pci/acpi.c |    2 +-
 123  drivers/pci/pci.c   |    2 +-
 124  drivers/pci/probe.c |    2 +-
 125  3 files changed, 3 insertions(+), 3 deletions(-)
 126 Merging wireless-current/master
 127 $ git merge wireless-current/master
 128 Merge made by recursive.
 129  drivers/net/wireless/iwlegacy/iwl-4965.c    |    3 ++-
 130  drivers/net/wireless/iwlwifi/iwl-5000.c     |    1 -
 131  drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c |   12 ++----------
 132  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    8 ++++++++
 133  drivers/net/wireless/rt2x00/rt2x00config.c  |    3 ++-
 134  drivers/net/wireless/rt2x00/rt2x00dev.c     |    4 ++++
 135  net/mac80211/ieee80211_i.h                  |    3 ---
 136  net/mac80211/key.c                          |   21 ++-------------------
 137  net/mac80211/tx.c                           |    7 ++++++-
 138  9 files changed, 26 insertions(+), 36 deletions(-)
 139 Merging driver-core.current/driver-core-linus
 140 $ git merge driver-core.current/driver-core-linus
 141 Already up-to-date.
 142 Merging tty.current/tty-linus
 143 $ git merge tty.current/tty-linus
 144 Merge made by recursive.
 145  drivers/tty/serial/8250_pci.c |   59 +++++++++++++++++++++++++++++++++++++++++
 146  1 files changed, 59 insertions(+), 0 deletions(-)
 147 Merging usb.current/usb-linus
 148 $ git merge usb.current/usb-linus
 149 Merge made by recursive.
 150  drivers/usb/class/cdc-acm.c            |    2 ++
 151  drivers/usb/core/hub.c                 |    6 ++++--
 152  drivers/usb/core/inode.c               |    1 -
 153  drivers/usb/gadget/amd5536udc.c        |    1 +
 154  drivers/usb/gadget/at91_udc.c          |    1 +
 155  drivers/usb/gadget/inode.c             |    4 +++-
 156  drivers/usb/gadget/mv_udc_core.c       |    8 ++++----
 157  drivers/usb/gadget/net2280.c           |    1 +
 158  drivers/usb/gadget/pxa25x_udc.c        |    5 ++---
 159  drivers/usb/gadget/s3c-hsotg.c         |   22 ++++++++++++----------
 160  drivers/usb/gadget/s3c-hsudc.c         |    7 +++++--
 161  drivers/usb/gadget/s3c2410_udc.c       |    1 +
 162  drivers/usb/host/xhci-dbg.c            |    8 ++++----
 163  drivers/usb/host/xhci-mem.c            |   14 ++++++++++++--
 164  drivers/usb/host/xhci-pci.c            |   14 ++++++++++++--
 165  drivers/usb/host/xhci-ring.c           |    2 +-
 166  drivers/usb/host/xhci.c                |   18 ++++++++++++++++--
 167  drivers/usb/host/xhci.h                |    6 ++++++
 168  drivers/usb/musb/musb_core.c           |    1 +
 169  drivers/usb/renesas_usbhs/mod_gadget.c |    1 +
 170  drivers/usb/serial/option.c            |   29 ++++++++++++++++++++++++++---
 171  21 files changed, 115 insertions(+), 37 deletions(-)
 172 Merging staging.current/staging-linus
 173 $ git merge staging.current/staging-linus
 174 Already up-to-date.
 175 Merging cpufreq-current/fixes
 176 $ git merge cpufreq-current/fixes
 177 Already up-to-date.
 178 Merging input-current/for-linus
 179 $ git merge input-current/for-linus
 180 Merge made by recursive.
 181  drivers/input/input.c    |    2 +-
 182  drivers/input/mousedev.c |    4 ++--
 183  2 files changed, 3 insertions(+), 3 deletions(-)
 184 Merging md-current/for-linus
 185 $ git merge md-current/for-linus
 186 Already up-to-date.
 187 Merging audit-current/for-linus
 188 $ git merge audit-current/for-linus
 189 Already up-to-date.
 190 Merging crypto-current/master
 191 $ git merge crypto-current/master
 192 Already up-to-date.
 193 Merging ide-curent/master
 194 $ git merge ide-curent/master
 195 Already up-to-date.
 196 Merging dwmw2/master
 197 $ git merge dwmw2/master
 198 Already up-to-date.
 199 Merging sh-current/sh-fixes-for-linus
 200 $ git merge sh-current/sh-fixes-for-linus
 201 Merge made by recursive.
 202  arch/sh/boot/compressed/Makefile |   22 +++++++++++++++++++---
 203  arch/sh/mm/cache-debugfs.c       |   25 +++++--------------------
 204  2 files changed, 24 insertions(+), 23 deletions(-)
 205 Merging rmobile-current/rmobile-fixes-for-linus
 206 $ git merge rmobile-current/rmobile-fixes-for-linus
 207 Already up-to-date.
 208 Merging fbdev-current/fbdev-fixes-for-linus
 209 $ git merge fbdev-current/fbdev-fixes-for-linus
 210 Merge made by recursive.
 211  drivers/video/arcfb.c                  |    5 +--
 212  drivers/video/bf537-lq035.c            |    1 +
 213  drivers/video/broadsheetfb.c           |    4 +--
 214  drivers/video/efifb.c                  |   34 ++++++++++++++++++++-----------
 215  drivers/video/hecubafb.c               |    5 +--
 216  drivers/video/imxfb.c                  |    4 +-
 217  drivers/video/metronomefb.c            |    4 +--
 218  drivers/video/modedb.c                 |    1 +
 219  drivers/video/pxa168fb.c               |   17 +++++++++------
 220  drivers/video/savage/savagefb_driver.c |   16 +++++++++++++++
 221  drivers/video/sh_mobile_lcdcfb.c       |    4 +-
 222  drivers/video/vga16fb.c                |    2 +
 223  drivers/video/xen-fbfront.c            |    3 +-
 224  13 files changed, 63 insertions(+), 37 deletions(-)
 225 Merging devicetree-current/devicetree/merge
 226 $ git merge devicetree-current/devicetree/merge
 227 Already up-to-date.
 228 Merging spi-current/spi/merge
 229 $ git merge spi-current/spi/merge
 230 Merge made by recursive.
 231  drivers/spi/omap2_mcspi.c |    2 +-
 232  1 files changed, 1 insertions(+), 1 deletions(-)
 233 Merging arm/for-next
 234 $ git merge arm/for-next
 235 Merge made by recursive.
 236  arch/arm/Kconfig                   |    3 +++
 237  arch/arm/include/asm/pgalloc.h     |    2 +-
 238  arch/arm/include/asm/pgtable.h     |   23 +++++++++++++----------
 239  arch/arm/include/asm/scatterlist.h |    4 ++++
 240  arch/arm/include/asm/tlb.h         |    1 +
 241  arch/arm/kernel/entry-armv.S       |    6 +++++-
 242  arch/arm/kernel/entry-common.S     |    2 ++
 243  arch/arm/mach-u300/timer.c         |    3 +--
 244  arch/arm/mach-vexpress/v2m.c       |   15 +++++++--------
 245  arch/arm/mm/init.c                 |    6 ++++--
 246  arch/arm/mm/proc-arm7tdmi.S        |    2 +-
 247  arch/arm/mm/proc-arm9tdmi.S        |    2 +-
 248  drivers/mmc/host/mmci.c            |   12 ++++++++++--
 249  13 files changed, 53 insertions(+), 28 deletions(-)
 250 Merging arm-lpae/for-next
 251 $ git merge arm-lpae/for-next
 252 Resolved 'arch/arm/include/asm/pgalloc.h' using previous resolution.
 253 Resolved 'arch/arm/include/asm/pgtable.h' using previous resolution.
 254 Resolved 'arch/arm/include/asm/tlb.h' using previous resolution.
 255 Auto-merging arch/arm/Kconfig
 256 Auto-merging arch/arm/include/asm/pgalloc.h
 257 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
 258 Auto-merging arch/arm/include/asm/pgtable.h
 259 CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
 260 Auto-merging arch/arm/include/asm/tlb.h
 261 CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
 262 Automatic merge failed; fix conflicts and then commit the result.
 263 $ git commit -v -a
 264 [master f429d11] Merge remote-tracking branch 'arm-lpae/for-next'
 265 $ git diff -M --stat --summary HEAD^..
 266  arch/arm/Kconfig                            |    2 +-
 267  arch/arm/boot/compressed/head.S             |    1 +
 268  arch/arm/include/asm/assembler.h            |   11 +
 269  arch/arm/include/asm/memory.h               |    4 +-
 270  arch/arm/include/asm/page.h                 |   44 +---
 271  arch/arm/include/asm/pgalloc.h              |   28 ++-
 272  arch/arm/include/asm/pgtable-2level-hwdef.h |   93 ++++++
 273  arch/arm/include/asm/pgtable-2level-types.h |   69 +++++
 274  arch/arm/include/asm/pgtable-2level.h       |  143 +++++++++
 275  arch/arm/include/asm/pgtable-3level-hwdef.h |   82 ++++++
 276  arch/arm/include/asm/pgtable-3level-types.h |   71 +++++
 277  arch/arm/include/asm/pgtable-3level.h       |  107 +++++++
 278  arch/arm/include/asm/pgtable-hwdef.h        |   81 +-----
 279  arch/arm/include/asm/pgtable.h              |  211 +++++---------
 280  arch/arm/include/asm/proc-fns.h             |   39 +++
 281  arch/arm/include/asm/setup.h                |    8 +
 282  arch/arm/include/asm/tlb.h                  |   11 +-
 283  arch/arm/include/asm/tlbflush.h             |    4 +-
 284  arch/arm/include/asm/types.h                |   11 +-
 285  arch/arm/kernel/head.S                      |  119 ++++++---
 286  arch/arm/kernel/module.c                    |    2 +-
 287  arch/arm/kernel/setup.c                     |   10 +
 288  arch/arm/kernel/sleep.S                     |    2 +
 289  arch/arm/mm/Kconfig                         |   13 +
 290  arch/arm/mm/Makefile                        |    4 +
 291  arch/arm/mm/alignment.c                     |    8 +-
 292  arch/arm/mm/context.c                       |   37 ++-
 293  arch/arm/mm/dma-mapping.c                   |    6 +-
 294  arch/arm/mm/fault.c                         |   82 +++++-
 295  arch/arm/mm/idmap.c                         |   36 +++-
 296  arch/arm/mm/ioremap.c                       |   17 +-
 297  arch/arm/mm/mm.h                            |    4 +-
 298  arch/arm/mm/mmu.c                           |   51 +++-
 299  arch/arm/mm/pgd.c                           |   51 +++-
 300  arch/arm/mm/proc-macros.S                   |    5 +-
 301  arch/arm/mm/proc-v7lpae.S                   |  422 +++++++++++++++++++++++++++
 302  36 files changed, 1538 insertions(+), 351 deletions(-)
 303  create mode 100644 arch/arm/include/asm/pgtable-2level-hwdef.h
 304  create mode 100644 arch/arm/include/asm/pgtable-2level-types.h
 305  create mode 100644 arch/arm/include/asm/pgtable-2level.h
 306  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
 307  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
 308  create mode 100644 arch/arm/include/asm/pgtable-3level.h
 309  create mode 100644 arch/arm/mm/proc-v7lpae.S
 310 Merging at91/at91-next
 311 $ git merge at91/at91-next
 312 Merge made by recursive.
 313  arch/arm/mach-at91/Makefile                   |    2 +-
 314  arch/arm/mach-at91/at91cap9.c                 |   45 +---
 315  arch/arm/mach-at91/at91rm9200.c               |   47 +---
 316  arch/arm/mach-at91/at91sam9260.c              |  100 ++-------
 317  arch/arm/mach-at91/at91sam9261.c              |   62 +-----
 318  arch/arm/mach-at91/at91sam9263.c              |   51 +----
 319  arch/arm/mach-at91/at91sam9g45.c              |   45 +---
 320  arch/arm/mach-at91/at91sam9rl.c               |   59 +----
 321  arch/arm/mach-at91/board-1arm.c               |   11 +-
 322  arch/arm/mach-at91/board-afeb-9260v1.c        |   12 +-
 323  arch/arm/mach-at91/board-cam60.c              |   12 +-
 324  arch/arm/mach-at91/board-cap9adk.c            |   12 +-
 325  arch/arm/mach-at91/board-carmeva.c            |   11 +-
 326  arch/arm/mach-at91/board-cpu9krea.c           |   11 +-
 327  arch/arm/mach-at91/board-cpuat91.c            |   11 +-
 328  arch/arm/mach-at91/board-csb337.c             |   11 +-
 329  arch/arm/mach-at91/board-csb637.c             |   11 +-
 330  arch/arm/mach-at91/board-eb9200.c             |   11 +-
 331  arch/arm/mach-at91/board-ecbat91.c            |   11 +-
 332  arch/arm/mach-at91/board-eco920.c             |   11 +-
 333  arch/arm/mach-at91/board-flexibity.c          |   11 +-
 334  arch/arm/mach-at91/board-foxg20.c             |   12 +-
 335  arch/arm/mach-at91/board-gsia18s.c            |    7 +-
 336  arch/arm/mach-at91/board-kafa.c               |   11 +-
 337  arch/arm/mach-at91/board-kb9202.c             |   11 +-
 338  arch/arm/mach-at91/board-neocore926.c         |   12 +-
 339  arch/arm/mach-at91/board-pcontrol-g20.c       |    9 +-
 340  arch/arm/mach-at91/board-picotux200.c         |   11 +-
 341  arch/arm/mach-at91/board-qil-a9260.c          |   12 +-
 342  arch/arm/mach-at91/board-rm9200dk.c           |   11 +-
 343  arch/arm/mach-at91/board-rm9200ek.c           |   11 +-
 344  arch/arm/mach-at91/board-sam9-l9260.c         |   12 +-
 345  arch/arm/mach-at91/board-sam9260ek.c          |   12 +-
 346  arch/arm/mach-at91/board-sam9261ek.c          |   12 +-
 347  arch/arm/mach-at91/board-sam9263ek.c          |   12 +-
 348  arch/arm/mach-at91/board-sam9g20ek.c          |   16 +-
 349  arch/arm/mach-at91/board-sam9m10g45ek.c       |   12 +-
 350  arch/arm/mach-at91/board-sam9rlek.c           |   12 +-
 351  arch/arm/mach-at91/board-snapper9260.c        |   11 +-
 352  arch/arm/mach-at91/board-stamp9g20.c          |   12 +-
 353  arch/arm/mach-at91/board-usb-a9260.c          |   12 +-
 354  arch/arm/mach-at91/board-usb-a9263.c          |   12 +-
 355  arch/arm/mach-at91/board-yl-9200.c            |   12 +-
 356  arch/arm/mach-at91/generic.h                  |   34 +--
 357  arch/arm/mach-at91/include/mach/at91_dbgu.h   |   27 ++-
 358  arch/arm/mach-at91/include/mach/at91cap9.h    |    1 -
 359  arch/arm/mach-at91/include/mach/at91rm9200.h  |    1 -
 360  arch/arm/mach-at91/include/mach/at91sam9260.h |    1 -
 361  arch/arm/mach-at91/include/mach/at91sam9261.h |    1 -
 362  arch/arm/mach-at91/include/mach/at91sam9263.h |    1 -
 363  arch/arm/mach-at91/include/mach/at91sam9g45.h |    1 -
 364  arch/arm/mach-at91/include/mach/at91sam9rl.h  |    1 -
 365  arch/arm/mach-at91/include/mach/cpu.h         |  159 ++++++++------
 366  arch/arm/mach-at91/include/mach/debug-macro.S |   14 +-
 367  arch/arm/mach-at91/include/mach/hardware.h    |   14 ++
 368  arch/arm/mach-at91/include/mach/io.h          |   16 ++-
 369  arch/arm/mach-at91/setup.c                    |  295 +++++++++++++++++++++++++
 370  arch/arm/mach-at91/soc.h                      |   59 +++++
 371  58 files changed, 695 insertions(+), 741 deletions(-)
 372  create mode 100644 arch/arm/mach-at91/setup.c
 373  create mode 100644 arch/arm/mach-at91/soc.h
 374 Merging davinci/davinci-next
 375 $ git merge davinci/davinci-next
 376 Already up-to-date.
 377 Merging i.MX/for-next
 378 $ git merge i.MX/for-next
 379 Removing arch/arm/plat-mxc/include/mach/iomux.h
 380 Merge made by recursive.
 381  arch/arm/configs/mx51_defconfig                |    3 +-
 382  arch/arm/configs/mxs_defconfig                 |    4 ++-
 383  arch/arm/mach-imx/Kconfig                      |    5 +++
 384  arch/arm/mach-imx/dma-v1.c                     |   25 ++---------------
 385  arch/arm/mach-imx/eukrea_mbimx27-baseboard.c   |   23 ++++------------
 386  arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c |   15 +++-------
 387  arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c |   13 ++-------
 388  arch/arm/mach-imx/mach-apf9328.c               |    7 +----
 389  arch/arm/mach-imx/mach-imx27_visstrim_m10.c    |    2 +-
 390  arch/arm/mach-imx/mach-mx27_3ds.c              |    2 +-
 391  arch/arm/mach-imx/mach-mx31moboard.c           |   14 ++-------
 392  arch/arm/mach-imx/mach-mx35_3ds.c              |    2 +-
 393  arch/arm/mach-imx/mx31lite-db.c                |   15 +++-------
 394  arch/arm/mach-mx5/Kconfig                      |    6 ++++
 395  arch/arm/mach-mx5/board-cpuimx51.c             |   12 +++-----
 396  arch/arm/mach-mx5/board-mx51_3ds.c             |    3 +-
 397  arch/arm/mach-mx5/board-mx51_babbage.c         |   34 ++++++++++++------------
 398  arch/arm/mach-mx5/board-mx51_efikamx.c         |   15 +++-------
 399  arch/arm/mach-mx5/board-mx51_efikasb.c         |   16 +++--------
 400  arch/arm/mach-mx5/board-mx53_evk.c             |   17 ++++++++++++
 401  arch/arm/mach-mx5/board-mx53_loco.c            |   17 +++++++++++-
 402  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c   |   24 ++++------------
 403  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c   |   19 +++----------
 404  arch/arm/mach-mxs/Kconfig                      |    2 +
 405  arch/arm/mach-mxs/mach-mx28evk.c               |   21 ++++++++++++++
 406  arch/arm/mach-mxs/mach-tx28.c                  |    5 +--
 407  arch/arm/plat-mxc/avic.c                       |   12 +++++---
 408  arch/arm/plat-mxc/devices/platform-imx-dma.c   |    6 +++-
 409  arch/arm/plat-mxc/include/mach/hardware.h      |   28 +++----------------
 410  arch/arm/plat-mxc/include/mach/iomux-mx53.h    |   10 +++---
 411  arch/arm/plat-mxc/include/mach/iomux-v1.h      |    3 --
 412  arch/arm/plat-mxc/include/mach/iomux.h         |   26 ------------------
 413  arch/arm/plat-mxc/include/mach/mx53.h          |   12 ++++----
 414  arch/arm/plat-mxc/include/mach/mxc.h           |    8 +++---
 415  arch/arm/plat-mxc/include/mach/timex.h         |   13 +-------
 416  arch/arm/plat-mxc/tzic.c                       |    4 ++-
 417  36 files changed, 178 insertions(+), 265 deletions(-)
 418  delete mode 100644 arch/arm/plat-mxc/include/mach/iomux.h
 419 Merging linux-spec/for-next
 420 $ git merge linux-spec/for-next
 421 Already up-to-date.
 422 Merging msm/for-next
 423 $ git merge msm/for-next
 424 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 425 Merge made by recursive.
 426  arch/arm/mach-msm/Makefile                      |    5 +-
 427  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 428  arch/arm/mach-msm/board-halibut.c               |    1 +
 429  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 430  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 431  arch/arm/mach-msm/board-msm8960.c               |   18 +
 432  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 433  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 434  arch/arm/mach-msm/board-trout.c                 |    1 +
 435  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 436  arch/arm/mach-msm/clock.h                       |   11 +
 437  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 438  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 439  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 440  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 441  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 442  arch/arm/mach-msm/devices.h                     |    8 +
 443  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 444  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 445  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 446  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 447  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 448  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 449  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 450  arch/arm/mach-msm/io.c                          |    3 -
 451  25 files changed, 808 insertions(+), 133 deletions(-)
 452  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 453  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 454 Merging omap/for-next
 455 $ git merge omap/for-next
 456 Merge made by recursive.
 457  arch/arm/mach-omap1/dma.c                    |   11 ++++++-----
 458  arch/arm/mach-omap2/board-2430sdp.c          |    2 +-
 459  arch/arm/mach-omap2/board-3430sdp.c          |    6 +++---
 460  arch/arm/mach-omap2/board-4430sdp.c          |   11 ++++++-----
 461  arch/arm/mach-omap2/board-apollon.c          |    2 +-
 462  arch/arm/mach-omap2/board-cm-t35.c           |    2 --
 463  arch/arm/mach-omap2/board-cm-t3517.c         |    5 ++---
 464  arch/arm/mach-omap2/board-devkit8000.c       |    2 --
 465  arch/arm/mach-omap2/board-omap3beagle.c      |    8 ++++++--
 466  arch/arm/mach-omap2/board-omap3pandora.c     |    4 +---
 467  arch/arm/mach-omap2/board-omap3touchbook.c   |    2 --
 468  arch/arm/mach-omap2/board-omap4panda.c       |    8 ++++----
 469  arch/arm/mach-omap2/board-overo.c            |    4 +---
 470  arch/arm/mach-omap2/board-rx51-peripherals.c |    3 ++-
 471  arch/arm/mach-omap2/board-zoom-display.c     |    2 +-
 472  arch/arm/mach-omap2/common-board-devices.c   |   20 ++++++++++----------
 473  arch/arm/mach-omap2/common-board-devices.h   |    2 ++
 474  arch/arm/mach-omap2/devices.c                |    2 +-
 475  arch/arm/mach-omap2/hsmmc.c                  |   16 +++++++++++++---
 476  arch/arm/mach-omap2/hsmmc.h                  |    1 +
 477  arch/arm/mach-omap2/mux.c                    |    5 ++++-
 478  arch/arm/mach-omap2/mux.h                    |    6 ++++--
 479  arch/arm/mach-omap2/mux44xx.c                |    5 +++--
 480  arch/arm/mach-omap2/omap_hwmod.c             |    2 +-
 481  arch/arm/mach-omap2/omap_hwmod_44xx_data.c   |    2 +-
 482  arch/arm/mach-omap2/omap_phy_internal.c      |    4 +++-
 483  arch/arm/plat-omap/include/plat/flash.h      |    1 +
 484  arch/arm/plat-omap/include/plat/iovmm.h      |    3 ---
 485  arch/arm/plat-omap/include/plat/mmc.h        |    3 +++
 486  arch/arm/plat-omap/iovmm.c                   |    4 ----
 487  arch/arm/plat-omap/sram.c                    |   12 ++++++------
 488  drivers/mmc/host/omap_hsmmc.c                |    3 +++
 489  32 files changed, 90 insertions(+), 73 deletions(-)
 490 Merging pxa/for-next
 491 $ git merge pxa/for-next
 492 Already up-to-date.
 493 Merging samsung/next-samsung
 494 $ git merge samsung/next-samsung
 495 Already up-to-date.
 496 Merging s5p/for-next
 497 $ git merge s5p/for-next
 498 Already up-to-date.
 499 Merging tegra/for-next
 500 $ git merge tegra/for-next
 501 Already up-to-date.
 502 Merging ux500-core/ux500-core
 503 $ git merge ux500-core/ux500-core
 504 Merge made by recursive.
 505  arch/arm/configs/u8500_defconfig              |    6 +++-
 506  arch/arm/mach-ux500/Kconfig                   |    8 ++++-
 507  arch/arm/mach-ux500/board-mop500-regulators.c |    9 +++++-
 508  arch/arm/mach-ux500/board-mop500-sdi.c        |   42 +++++++++++++++++-------
 509  arch/arm/mach-ux500/board-mop500.c            |    3 ++
 510  5 files changed, 53 insertions(+), 15 deletions(-)
 511 Merging xilinx/arm-next
 512 $ git merge xilinx/arm-next
 513 Auto-merging arch/arm/Kconfig
 514 Auto-merging arch/arm/Makefile
 515 Auto-merging arch/arm/mm/Kconfig
 516 Merge made by recursive.
 517  Documentation/devicetree/bindings/arm/xilinx.txt |    7 +
 518  arch/arm/Kconfig                                 |   14 +
 519  arch/arm/Makefile                                |    2 +
 520  arch/arm/boot/dts/zynq-ep107.dts                 |   52 ++++
 521  arch/arm/mach-zynq/Makefile                      |    6 +
 522  arch/arm/mach-zynq/Makefile.boot                 |    3 +
 523  arch/arm/mach-zynq/board_dt.c                    |   37 +++
 524  arch/arm/mach-zynq/common.c                      |  102 ++++++++
 525  arch/arm/mach-zynq/common.h                      |   29 ++
 526  arch/arm/mach-zynq/include/mach/clkdev.h         |   32 +++
 527  arch/arm/mach-zynq/include/mach/debug-macro.S    |   36 +++
 528  arch/arm/mach-zynq/include/mach/entry-macro.S    |   30 +++
 529  arch/arm/mach-zynq/include/mach/hardware.h       |   18 ++
 530  arch/arm/mach-zynq/include/mach/io.h             |   33 +++
 531  arch/arm/mach-zynq/include/mach/irqs.h           |   21 ++
 532  arch/arm/mach-zynq/include/mach/memory.h         |   22 ++
 533  arch/arm/mach-zynq/include/mach/system.h         |   28 ++
 534  arch/arm/mach-zynq/include/mach/timex.h          |   23 ++
 535  arch/arm/mach-zynq/include/mach/uart.h           |   25 ++
 536  arch/arm/mach-zynq/include/mach/uncompress.h     |   51 ++++
 537  arch/arm/mach-zynq/include/mach/vmalloc.h        |   20 ++
 538  arch/arm/mach-zynq/include/mach/zynq_soc.h       |   48 ++++
 539  arch/arm/mach-zynq/timer.c                       |  298 ++++++++++++++++++++++
 540  arch/arm/mm/Kconfig                              |    2 +-
 541  24 files changed, 938 insertions(+), 1 deletions(-)
 542  create mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt
 543  create mode 100644 arch/arm/boot/dts/zynq-ep107.dts
 544  create mode 100644 arch/arm/mach-zynq/Makefile
 545  create mode 100644 arch/arm/mach-zynq/Makefile.boot
 546  create mode 100644 arch/arm/mach-zynq/board_dt.c
 547  create mode 100644 arch/arm/mach-zynq/common.c
 548  create mode 100644 arch/arm/mach-zynq/common.h
 549  create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
 550  create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S
 551  create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S
 552  create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
 553  create mode 100644 arch/arm/mach-zynq/include/mach/io.h
 554  create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
 555  create mode 100644 arch/arm/mach-zynq/include/mach/memory.h
 556  create mode 100644 arch/arm/mach-zynq/include/mach/system.h
 557  create mode 100644 arch/arm/mach-zynq/include/mach/timex.h
 558  create mode 100644 arch/arm/mach-zynq/include/mach/uart.h
 559  create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
 560  create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
 561  create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
 562  create mode 100644 arch/arm/mach-zynq/timer.c
 563 Merging blackfin/for-linus
 564 $ git merge blackfin/for-linus
 565 Merge made by recursive.
 566  arch/blackfin/include/asm/mutex.h            |   77 +-------------
 567  arch/blackfin/include/asm/pda.h              |   10 ++
 568  arch/blackfin/kernel/asm-offsets.c           |   10 ++
 569  arch/blackfin/kernel/setup.c                 |   16 ++-
 570  arch/blackfin/kernel/time.c                  |    4 +-
 571  arch/blackfin/mach-bf518/boards/ezbrd.c      |   50 ---------
 572  arch/blackfin/mach-bf518/boards/tcm-bf518.c  |   38 -------
 573  arch/blackfin/mach-bf527/boards/ad7160eval.c |   10 --
 574  arch/blackfin/mach-bf527/boards/cm_bf527.c   |   37 ------
 575  arch/blackfin/mach-bf527/boards/ezbrd.c      |   53 ---------
 576  arch/blackfin/mach-bf527/boards/ezkit.c      |   53 ---------
 577  arch/blackfin/mach-bf527/boards/tll6527m.c   |   70 ------------
 578  arch/blackfin/mach-bf533/boards/H8606.c      |   20 ----
 579  arch/blackfin/mach-bf533/boards/blackstamp.c |   10 --
 580  arch/blackfin/mach-bf533/boards/cm_bf533.c   |   21 ----
 581  arch/blackfin/mach-bf533/boards/ezkit.c      |   28 -----
 582  arch/blackfin/mach-bf533/boards/ip0x.c       |    1 -
 583  arch/blackfin/mach-bf533/boards/stamp.c      |   29 -----
 584  arch/blackfin/mach-bf537/boards/cm_bf537e.c  |   21 ----
 585  arch/blackfin/mach-bf537/boards/cm_bf537u.c  |   21 ----
 586  arch/blackfin/mach-bf537/boards/dnp5370.c    |    2 -
 587  arch/blackfin/mach-bf537/boards/minotaur.c   |    2 -
 588  arch/blackfin/mach-bf537/boards/pnav10.c     |   29 -----
 589  arch/blackfin/mach-bf537/boards/stamp.c      |  101 -----------------
 590  arch/blackfin/mach-bf537/boards/tcm_bf537.c  |   21 ----
 591  arch/blackfin/mach-bf538/boards/ezkit.c      |   25 ----
 592  arch/blackfin/mach-bf548/boards/cm_bf548.c   |   15 ---
 593  arch/blackfin/mach-bf548/boards/ezkit.c      |   23 ----
 594  arch/blackfin/mach-bf561/boards/acvilon.c    |    9 --
 595  arch/blackfin/mach-bf561/boards/cm_bf561.c   |   28 -----
 596  arch/blackfin/mach-bf561/boards/ezkit.c      |    8 --
 597  arch/blackfin/mach-bf561/secondary.S         |  152 ++++++++++----------------
 598  arch/blackfin/mach-common/head.S             |   36 ++----
 599  arch/blackfin/mach-common/smp.c              |   17 ++--
 600  34 files changed, 111 insertions(+), 936 deletions(-)
 601 Merging cris/for-next
 602 $ git merge cris/for-next
 603 Auto-merging drivers/net/cris/eth_v10.c
 604 Merge made by recursive.
 605  Documentation/cris/README               |   62 +++++++++++++++---------------
 606  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 607  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 608  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 609  drivers/net/cris/eth_v10.c              |    1 -
 610  5 files changed, 34 insertions(+), 39 deletions(-)
 611 Merging ia64/test
 612 $ git merge ia64/test
 613 Merge made by recursive.
 614  arch/ia64/Kconfig            |    4 +++
 615  arch/ia64/include/asm/gpio.h |   55 ++++++++++++++++++++++++++++++++++++++++++
 616  2 files changed, 59 insertions(+), 0 deletions(-)
 617  create mode 100644 arch/ia64/include/asm/gpio.h
 618 Merging m68k/for-next
 619 $ git merge m68k/for-next
 620 Merge made by recursive.
 621  arch/m68k/amiga/chipram.c  |  136 ++++++++++++++++++++-----------------------
 622  arch/sparc/kernel/ioport.c |   32 ++--------
 623  include/linux/ioport.h     |    1 +
 624  kernel/resource.c          |   21 +++++++
 625  4 files changed, 92 insertions(+), 98 deletions(-)
 626 Merging m68knommu/for-next
 627 $ git merge m68knommu/for-next
 628 Removing arch/m68k/include/asm/bitops_mm.h
 629 Removing arch/m68k/include/asm/bitops_no.h
 630 Removing arch/m68k/include/asm/hardirq_mm.h
 631 Removing arch/m68k/include/asm/hardirq_no.h
 632 Removing arch/m68k/include/asm/system_mm.h
 633 Removing arch/m68k/include/asm/system_no.h
 634 Removing arch/m68k/kernel/module_mm.c
 635 Removing arch/m68k/kernel/module_no.c
 636 Merge made by recursive.
 637  arch/m68k/Kconfig.nommu             |   52 +++-
 638  arch/m68k/include/asm/bitops.h      |  522 ++++++++++++++++++++++++++++++++++-
 639  arch/m68k/include/asm/bitops_mm.h   |  501 ---------------------------------
 640  arch/m68k/include/asm/bitops_no.h   |  333 ----------------------
 641  arch/m68k/include/asm/entry_no.h    |   12 +-
 642  arch/m68k/include/asm/hardirq.h     |   35 +++-
 643  arch/m68k/include/asm/hardirq_mm.h  |   16 -
 644  arch/m68k/include/asm/hardirq_no.h  |   19 --
 645  arch/m68k/include/asm/irq.h         |    9 -
 646  arch/m68k/include/asm/module.h      |   31 +--
 647  arch/m68k/include/asm/system.h      |  194 +++++++++++++-
 648  arch/m68k/include/asm/system_mm.h   |  193 -------------
 649  arch/m68k/include/asm/system_no.h   |  153 ----------
 650  arch/m68k/kernel/m68k_ksyms.c       |    3 +-
 651  arch/m68k/kernel/module.c           |  157 ++++++++++-
 652  arch/m68k/kernel/module_mm.c        |  155 -----------
 653  arch/m68k/kernel/module_no.c        |  126 ---------
 654  arch/m68k/kernel/vmlinux.lds_no.S   |   20 +-
 655  arch/m68k/lib/memcpy.c              |    9 +-
 656  arch/m68k/lib/memset.c              |    9 +-
 657  arch/m68k/lib/muldi3.c              |   21 +-
 658  arch/m68k/platform/68328/entry.S    |   13 +-
 659  arch/m68k/platform/68360/entry.S    |   13 +-
 660  arch/m68k/platform/coldfire/entry.S |   24 +-
 661  24 files changed, 1014 insertions(+), 1606 deletions(-)
 662  delete mode 100644 arch/m68k/include/asm/bitops_mm.h
 663  delete mode 100644 arch/m68k/include/asm/bitops_no.h
 664  delete mode 100644 arch/m68k/include/asm/hardirq_mm.h
 665  delete mode 100644 arch/m68k/include/asm/hardirq_no.h
 666  delete mode 100644 arch/m68k/include/asm/system_mm.h
 667  delete mode 100644 arch/m68k/include/asm/system_no.h
 668  delete mode 100644 arch/m68k/kernel/module_mm.c
 669  delete mode 100644 arch/m68k/kernel/module_no.c
 670 Merging microblaze/next
 671 $ git merge microblaze/next
 672 Already up-to-date.
 673 Merging mips/mips-for-linux-next
 674 $ git merge mips/mips-for-linux-next
 675 Auto-merging arch/mips/kernel/cpu-probe.c
 676 Auto-merging arch/mips/mm/c-r4k.c
 677 Auto-merging arch/mips/mm/init.c
 678 Merge made by recursive.
 679  arch/mips/include/asm/fixmap.h                     |   10 +--
 680  arch/mips/include/asm/irq.h                        |    1 -
 681  arch/mips/include/asm/mach-bcm63xx/spaces.h        |   17 +++
 682  arch/mips/include/asm/mach-generic/dma-coherence.h |    1 -
 683  arch/mips/include/asm/mach-generic/spaces.h        |    4 +
 684  arch/mips/include/asm/mach-ip27/dma-coherence.h    |    1 -
 685  arch/mips/include/asm/mach-jazz/dma-coherence.h    |    1 -
 686  .../mips/include/asm/mach-loongson/dma-coherence.h |    1 -
 687  .../include/asm/mach-malta/cpu-feature-overrides.h |    2 +
 688  .../asm/mach-mipssim/cpu-feature-overrides.h       |    2 +
 689  .../asm/mach-powertv/cpu-feature-overrides.h       |   59 ++++++++++
 690  arch/mips/include/asm/mach-powertv/dma-coherence.h |    1 -
 691  arch/mips/include/asm/mach-tx39xx/spaces.h         |   17 +++
 692  arch/mips/include/asm/mach-tx49xx/spaces.h         |   17 +++
 693  arch/mips/kernel/cpu-probe.c                       |    1 -
 694  arch/mips/kernel/irq_cpu.c                         |   14 +--
 695  arch/mips/kernel/perf_event.c                      |    2 -
 696  arch/mips/loongson/lemote-2f/ec_kb3310b.c          |    2 -
 697  arch/mips/mm/c-r4k.c                               |    4 +
 698  arch/mips/mm/dma-default.c                         |  114 ++++++++++++--------
 699  arch/mips/mm/init.c                                |    8 +-
 700  arch/mips/mm/pgtable-32.c                          |    2 +-
 701  arch/mips/mm/pgtable-64.c                          |    2 +-
 702  arch/mips/nxp/pnx8550/common/setup.c               |    2 -
 703  arch/mips/pnx8550/common/setup.c                   |    2 -
 704  25 files changed, 203 insertions(+), 84 deletions(-)
 705  create mode 100644 arch/mips/include/asm/mach-bcm63xx/spaces.h
 706  create mode 100644 arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
 707  create mode 100644 arch/mips/include/asm/mach-tx39xx/spaces.h
 708  create mode 100644 arch/mips/include/asm/mach-tx49xx/spaces.h
 709 Merging parisc/for-next
 710 $ git merge parisc/for-next
 711 Already up-to-date!
 712 Merge made by recursive.
 713 Merging powerpc/next
 714 $ git merge powerpc/next
 715 Already up-to-date.
 716 Merging 4xx/next
 717 $ git merge 4xx/next
 718 Already up-to-date.
 719 Merging 52xx-and-virtex/powerpc/next
 720 $ git merge 52xx-and-virtex/powerpc/next
 721 Removing arch/powerpc/boot/dtc-src/.gitignore
 722 Merge made by recursive.
 723  arch/powerpc/boot/.gitignore                 |    1 -
 724  arch/powerpc/boot/dtc-src/.gitignore         |    3 -
 725  arch/powerpc/boot/dts/charon.dts             |  236 ++++++++++++++++++++++++++
 726  arch/powerpc/configs/52xx/tqm5200_defconfig  |   20 ++-
 727  arch/powerpc/platforms/52xx/mpc5200_simple.c |    1 +
 728  5 files changed, 249 insertions(+), 12 deletions(-)
 729  delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore
 730  create mode 100644 arch/powerpc/boot/dts/charon.dts
 731 Merging galak/next
 732 $ git merge galak/next
 733 Resolved 'arch/powerpc/boot/dts/p2020ds.dts' using previous resolution.
 734 Resolved 'arch/powerpc/boot/dts/p2020rdb.dts' using previous resolution.
 735 Auto-merging arch/powerpc/boot/dts/p2020ds.dts
 736 CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
 737 Auto-merging arch/powerpc/boot/dts/p2020rdb.dts
 738 CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
 739 Automatic merge failed; fix conflicts and then commit the result.
 740 $ git commit -v -a
 741 [master 5bfb40e] Merge remote-tracking branch 'galak/next'
 742 $ git diff -M --stat --summary HEAD^..
 743 Merging s390/features
 744 $ git merge s390/features
 745 Merge made by recursive.
 746  arch/s390/Kconfig                 |    1 +
 747  arch/s390/include/asm/pgalloc.h   |    8 +-
 748  arch/s390/include/asm/pgtable.h   |   39 ++++--
 749  arch/s390/include/asm/qdio.h      |  119 ++++------------
 750  arch/s390/include/asm/tlb.h       |   94 ++++++-------
 751  arch/s390/kvm/kvm-s390.c          |    1 +
 752  arch/s390/kvm/sie64a.S            |    2 +
 753  arch/s390/mm/pgtable.c            |  292 +++++++++++++++----------------------
 754  drivers/s390/cio/qdio_main.c      |    6 +-
 755  drivers/s390/net/qeth_core.h      |    2 +-
 756  drivers/s390/net/qeth_core_main.c |   57 ++++----
 757  drivers/s390/scsi/zfcp_fsf.c      |   45 +++---
 758  drivers/s390/scsi/zfcp_qdio.c     |   11 +-
 759  drivers/s390/scsi/zfcp_qdio.h     |    9 +-
 760  14 files changed, 291 insertions(+), 395 deletions(-)
 761 Merging sh/sh-latest
 762 $ git merge sh/sh-latest
 763 Already up-to-date.
 764 Merging rmobile/rmobile-latest
 765 $ git merge rmobile/rmobile-latest
 766 Already up-to-date.
 767 Merging sparc/master
 768 $ git merge sparc/master
 769 Already up-to-date.
 770 Merging tile/master
 771 $ git merge tile/master
 772 Already up-to-date.
 773 Merging unicore32/unicore32
 774 $ git merge unicore32/unicore32
 775 Resolved 'drivers/rtc/Kconfig' using previous resolution.
 776 Auto-merging MAINTAINERS
 777 Auto-merging arch/unicore32/configs/unicore32_defconfig
 778 Auto-merging drivers/net/Makefile
 779 Auto-merging drivers/rtc/Kconfig
 780 CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
 781 Auto-merging drivers/rtc/Makefile
 782 Auto-merging drivers/rtc/rtc-puv3.c
 783 Automatic merge failed; fix conflicts and then commit the result.
 784 $ git commit -v -a
 785 [master 338360e] Merge remote-tracking branch 'unicore32/unicore32'
 786 $ git diff -M --stat --summary HEAD^..
 787  MAINTAINERS                                        |    2 +
 788  arch/unicore32/Kconfig                             |    4 -
 789  arch/unicore32/Makefile                            |   38 +-
 790  arch/unicore32/boot/compressed/Makefile            |    2 +-
 791  .../{debug_defconfig => unicore32_defconfig}       |   10 +-
 792  arch/unicore32/include/asm/Kbuild                  |   59 +
 793  arch/unicore32/kernel/Makefile                     |    1 -
 794  arch/unicore32/kernel/vmlinux.lds.S                |    2 +-
 795  drivers/net/Kconfig                                |    5 +
 796  drivers/net/Makefile                               |    1 +
 797  drivers/net/mac-puv3.c                             | 1942 ++++++++++++++++++++
 798  drivers/rtc/Kconfig                                |    9 +
 799  drivers/rtc/Makefile                               |    1 +
 800  .../kernel/rtc.c => drivers/rtc/rtc-puv3.c         |   14 +-
 801  14 files changed, 2029 insertions(+), 61 deletions(-)
 802  rename arch/unicore32/configs/{debug_defconfig => unicore32_defconfig} (97%)
 803  create mode 100644 drivers/net/mac-puv3.c
 804  rename arch/unicore32/kernel/rtc.c => drivers/rtc/rtc-puv3.c (98%)
 805 Merging xtensa/master
 806 $ git merge xtensa/master
 807 Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution.
 808 Auto-merging arch/xtensa/Kconfig
 809 Auto-merging arch/xtensa/Makefile
 810 Auto-merging arch/xtensa/boot/Makefile
 811 Auto-merging arch/xtensa/configs/iss_defconfig
 812 CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
 813 Auto-merging arch/xtensa/include/asm/coprocessor.h
 814 Auto-merging arch/xtensa/kernel/Makefile
 815 Auto-merging arch/xtensa/kernel/time.c
 816 Automatic merge failed; fix conflicts and then commit the result.
 817 $ git commit -v -a
 818 [master c034509] Merge remote-tracking branch 'xtensa/master'
 819 $ git diff -M --stat --summary HEAD^..
 820  arch/xtensa/Kconfig                                |   17 +-
 821  arch/xtensa/Makefile                               |    5 +-
 822  arch/xtensa/boot/Makefile                          |    1 +
 823  arch/xtensa/include/asm/coprocessor.h              |    9 +-
 824  arch/xtensa/include/asm/io.h                       |   40 ++--
 825  arch/xtensa/include/asm/irq.h                      |    7 +-
 826  arch/xtensa/include/asm/serial.h                   |   12 +-
 827  arch/xtensa/kernel/Makefile                        |    4 +-
 828  arch/xtensa/kernel/time.c                          |    2 +-
 829  arch/xtensa/platforms/xtavnet/Makefile             |   10 +
 830  .../platforms/xtavnet/include/platform/hardware.h  |   85 ++++++
 831  .../platforms/xtavnet/include/platform/lcd.h       |   22 ++
 832  .../platforms/xtavnet/include/platform/serial.h    |    1 +
 833  arch/xtensa/platforms/xtavnet/lcd.c                |   79 ++++++
 834  arch/xtensa/platforms/xtavnet/setup.c              |  269 ++++++++++++++++++++
 835  15 files changed, 526 insertions(+), 37 deletions(-)
 836  create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
 837  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
 838  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
 839  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
 840  create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
 841  create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
 842 Merging ceph/for-next
 843 $ git merge ceph/for-next
 844 Merge made by recursive.
 845 Merging cifs/master
 846 $ git merge cifs/master
 847 Merge made by recursive.
 848  fs/cifs/Kconfig   |    3 ++-
 849  fs/cifs/connect.c |    4 ++--
 850  2 files changed, 4 insertions(+), 3 deletions(-)
 851 Merging configfs/linux-next
 852 $ git merge configfs/linux-next
 853 Already up-to-date.
 854 Merging ecryptfs/next
 855 $ git merge ecryptfs/next
 856 Merge made by recursive.
 857 Merging ext3/for_next
 858 $ git merge ext3/for_next
 859 Merge made by recursive.
 860  fs/ext3/balloc.c            |   34 +-
 861  fs/ext3/file.c              |    1 -
 862  fs/ext3/fsync.c             |   15 +-
 863  fs/ext3/ialloc.c            |    4 +
 864  fs/ext3/inode.c             |   56 ++-
 865  fs/ext3/namei.c             |    3 +
 866  fs/ext3/super.c             |   13 +
 867  fs/ext3/xattr.c             |   12 +-
 868  fs/jbd/checkpoint.c         |    4 +
 869  fs/jbd/commit.c             |   11 +
 870  fs/jbd/journal.c            |    4 +
 871  fs/jbd/transaction.c        |   10 +-
 872  include/linux/ext3_fs.h     |    2 +-
 873  include/trace/events/ext3.h |  864 +++++++++++++++++++++++++++++++++++++++++++
 874  include/trace/events/jbd.h  |  203 ++++++++++
 875  15 files changed, 1197 insertions(+), 39 deletions(-)
 876  create mode 100644 include/trace/events/ext3.h
 877  create mode 100644 include/trace/events/jbd.h
 878 Merging ext4/dev
 879 $ git merge ext4/dev
 880 Merge made by recursive.
 881  fs/ext4/ext4_extents.h |    9 ++++++---
 882  fs/ext4/extents.c      |   42 ++++++++++++++++++++----------------------
 883  fs/ext4/mballoc.c      |    2 +-
 884  fs/ext4/move_extent.c  |   10 +++++-----
 885  fs/ext4/super.c        |   15 ++++++++++++---
 886  5 files changed, 44 insertions(+), 34 deletions(-)
 887 Merging fatfs/master
 888 $ git merge fatfs/master
 889 Merge made by recursive.
 890  fs/fat/file.c |    2 +-
 891  1 files changed, 1 insertions(+), 1 deletions(-)
 892 Merging fuse/for-next
 893 $ git merge fuse/for-next
 894 Already up-to-date.
 895 Merging gfs2/master
 896 $ git merge gfs2/master
 897 Auto-merging fs/gfs2/glock.c
 898 Merge made by recursive.
 899  fs/gfs2/glock.c |    9 +++++++--
 900  1 files changed, 7 insertions(+), 2 deletions(-)
 901 Merging hfsplus/for-next
 902 $ git merge hfsplus/for-next
 903 Merge made by recursive.
 904  fs/hfsplus/extents.c |    9 ++++++---
 905  fs/hfsplus/super.c   |    9 +++++++++
 906  fs/hfsplus/unicode.c |   35 +++++++++++++++++++++++++++--------
 907  fs/hfsplus/wrapper.c |    9 +++------
 908  4 files changed, 45 insertions(+), 17 deletions(-)
 909 Merging jfs/next
 910 $ git merge jfs/next
 911 Already up-to-date.
 912 Merging logfs/master
 913 $ git merge logfs/master
 914 Resolved 'fs/logfs/logfs.h' using previous resolution.
 915 Auto-merging fs/logfs/logfs.h
 916 CONFLICT (content): Merge conflict in fs/logfs/logfs.h
 917 Automatic merge failed; fix conflicts and then commit the result.
 918 $ git commit -v -a
 919 [master a0eb794] Merge remote-tracking branch 'logfs/master'
 920 $ git diff -M --stat --summary HEAD^..
 921 Merging nfs/linux-next
 922 $ git merge nfs/linux-next
 923 Merge made by recursive.
 924  fs/lockd/clntproc.c          |   17 ++-
 925  fs/nfs/callback_proc.c       |   57 ++++--
 926  fs/nfs/client.c              |    5 +-
 927  fs/nfs/internal.h            |    3 +
 928  fs/nfs/namespace.c           |    2 +-
 929  fs/nfs/nfs4_fs.h             |    5 +
 930  fs/nfs/nfs4filelayout.c      |    7 +-
 931  fs/nfs/nfs4filelayout.h      |   11 +-
 932  fs/nfs/nfs4filelayoutdev.c   |  452 +++++++++++++++++++++++++++++++-----------
 933  fs/nfs/nfs4proc.c            |  211 +++++++++++++++++++-
 934  fs/nfs/nfs4state.c           |    9 +-
 935  fs/nfs/nfs4xdr.c             |  249 +++++++++++++++++++++++-
 936  fs/nfs/pnfs.c                |   13 +-
 937  fs/nfs/pnfs.h                |    1 +
 938  fs/nfs/pnfs_dev.c            |   13 +-
 939  include/linux/nfs4.h         |    3 +
 940  include/linux/nfs_fs_sb.h    |    5 +-
 941  include/linux/nfs_xdr.h      |   29 +++
 942  include/linux/sunrpc/sched.h |    3 +-
 943  net/sunrpc/clnt.c            |    6 +-
 944  net/sunrpc/sched.c           |    1 +
 945  21 files changed, 934 insertions(+), 168 deletions(-)
 946 Merging nfsd/nfsd-next
 947 $ git merge nfsd/nfsd-next
 948 Already up-to-date.
 949 Merging nilfs2/for-next
 950 $ git merge nilfs2/for-next
 951 Merge made by recursive.
 952  fs/nilfs2/btree.c |   39 +++++++++++++++++++++++++++------------
 953  1 files changed, 27 insertions(+), 12 deletions(-)
 954 Merging ocfs2/linux-next
 955 $ git merge ocfs2/linux-next
 956 Merge made by recursive.
 957  fs/ocfs2/dlmglue.c      |   21 +++++++++++++++------
 958  fs/ocfs2/ioctl.c        |    8 ++++----
 959  fs/ocfs2/move_extents.c |    2 +-
 960  fs/ocfs2/ocfs2.h        |    4 ++--
 961  fs/ocfs2/super.c        |    3 ++-
 962  5 files changed, 24 insertions(+), 14 deletions(-)
 963 Merging omfs/for-next
 964 $ git merge omfs/for-next
 965 Already up-to-date.
 966 Merging squashfs/master
 967 $ git merge squashfs/master
 968 Already up-to-date.
 969 Merging udf/for_next
 970 $ git merge udf/for_next
 971 Already up-to-date.
 972 Merging v9fs/for-next
 973 $ git merge v9fs/for-next
 974 Already up-to-date.
 975 Merging ubifs/linux-next
 976 $ git merge ubifs/linux-next
 977 Already up-to-date.
 978 Merging xfs/master
 979 $ git merge xfs/master
 980 Already up-to-date.
 981 Merging vfs/for-next
 982 $ git merge vfs/for-next
 983 Auto-merging fs/btrfs/super.c
 984 Auto-merging fs/ocfs2/super.c
 985 Merge made by recursive.
 986  fs/btrfs/super.c       |    2 +-
 987  fs/dcache.c            |   34 ++++++++++++++++++++++++++++++-
 988  fs/fuse/inode.c        |    2 +
 989  fs/jfs/jfs_logmgr.c    |    2 +-
 990  fs/namei.c             |   51 ++++++++++++++++++++++++++++++++++++++++++++++++
 991  fs/ocfs2/super.c       |    2 +-
 992  fs/super.c             |   38 ++++++++++++++++++++++++++++++++++-
 993  include/linux/dcache.h |    7 ++++++
 994  include/linux/fs.h     |    5 +++-
 995  mm/filemap.c           |    2 +-
 996  10 files changed, 137 insertions(+), 8 deletions(-)
 997 Merging vfs-scale/vfs-scale-working
 998 $ git merge vfs-scale/vfs-scale-working
 999 Already up-to-date.
1000 Merging pci/linux-next
1001 $ git merge pci/linux-next
1002 Merge made by recursive.
1003  arch/x86/Kconfig                       |    2 +-
1004  drivers/pci/hotplug/acpi_pcihp.c       |    6 +-
1005  drivers/pci/pcie/aer/aerdrv_core.c     |   76 +++++++++++++++++++++++++++++---
1006  drivers/pci/pcie/aer/aerdrv_errprint.c |    3 +-
1007  include/linux/aer.h                    |    3 +
1008  5 files changed, 78 insertions(+), 12 deletions(-)
1009 Merging hid/for-next
1010 $ git merge hid/for-next
1011 Already up-to-date.
1012 Merging quilt/i2c
1013 $ git merge quilt/i2c
1014 Already up-to-date.
1015 Merging bjdooks-i2c/next-i2c
1016 $ git merge bjdooks-i2c/next-i2c
1017 Already up-to-date.
1018 Merging quilt/jdelvare-hwmon
1019 $ git merge quilt/jdelvare-hwmon
1020 Merge made by recursive.
1021  Documentation/hwmon/sch5636    |   31 +++
1022  drivers/hwmon/Kconfig          |   20 ++
1023  drivers/hwmon/Makefile         |    2 +
1024  drivers/hwmon/emc6w201.c       |   58 ++++-
1025  drivers/hwmon/f71882fg.c       |    2 +-
1026  drivers/hwmon/sch5627.c        |  336 ++-----------------------
1027  drivers/hwmon/sch5636.c        |  539 ++++++++++++++++++++++++++++++++++++++++
1028  drivers/hwmon/sch56xx-common.c |  340 +++++++++++++++++++++++++
1029  drivers/hwmon/sch56xx-common.h |   24 ++
1030  9 files changed, 1026 insertions(+), 326 deletions(-)
1031  create mode 100644 Documentation/hwmon/sch5636
1032  create mode 100644 drivers/hwmon/sch5636.c
1033  create mode 100644 drivers/hwmon/sch56xx-common.c
1034  create mode 100644 drivers/hwmon/sch56xx-common.h
1035 Merging hwmon-staging/hwmon-next
1036 $ git merge hwmon-staging/hwmon-next
1037 Auto-merging MAINTAINERS
1038 Auto-merging drivers/hwmon/Kconfig
1039 Auto-merging drivers/hwmon/Makefile
1040 Merge made by recursive.
1041  Documentation/hwmon/max1668 |   60 ++++++
1042  MAINTAINERS                 |    7 +
1043  drivers/hwmon/Kconfig       |   10 +
1044  drivers/hwmon/Makefile      |    1 +
1045  drivers/hwmon/max1668.c     |  480 +++++++++++++++++++++++++++++++++++++++++++
1046  5 files changed, 558 insertions(+), 0 deletions(-)
1047  create mode 100644 Documentation/hwmon/max1668
1048  create mode 100644 drivers/hwmon/max1668.c
1049 Merging quilt/kernel-doc
1050 $ git merge quilt/kernel-doc
1051 Already up-to-date.
1052 Merging docs/docs-move
1053 $ git merge docs/docs-move
1054 Already up-to-date.
1055 Merging v4l-dvb/master
1056 $ git merge v4l-dvb/master
1057 Removing Documentation/DocBook/dvb/frontend.h.xml
1058 Removing Documentation/DocBook/media-entities.tmpl
1059 Removing Documentation/DocBook/media-indices.tmpl
1060 Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml
1061 Auto-merging Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
1062 Removing Documentation/DocBook/v4l/videodev2.h.xml
1063 Removing drivers/media/video/gspca/coarse_expo_autogain.h
1064 Merge made by recursive.
1065  Documentation/DocBook/.gitignore                   |   11 +-
1066  Documentation/DocBook/Makefile                     |   30 +-
1067  Documentation/DocBook/dvb/frontend.h.xml           |  428 -----
1068  Documentation/DocBook/media-entities.tmpl          |  464 -----
1069  Documentation/DocBook/media-indices.tmpl           |   89 -
1070  Documentation/DocBook/media/Makefile               |  259 +++
1071  Documentation/DocBook/{ => media}/dvb/.gitignore   |    0
1072  Documentation/DocBook/{ => media}/dvb/audio.xml    |    0
1073  Documentation/DocBook/{ => media}/dvb/ca.xml       |    0
1074  Documentation/DocBook/{ => media}/dvb/demux.xml    |    0
1075  Documentation/DocBook/{ => media}/dvb/dvbapi.xml   |    0
1076  .../DocBook/{ => media}/dvb/dvbproperty.xml        |    0
1077  Documentation/DocBook/{ => media}/dvb/dvbstb.pdf   |  Bin 1881 -> 1881 bytes
1078  Documentation/DocBook/{ => media}/dvb/dvbstb.png   |  Bin 22655 -> 22655 bytes
1079  Documentation/DocBook/{ => media}/dvb/examples.xml |    0
1080  Documentation/DocBook/{ => media}/dvb/frontend.xml |    0
1081  Documentation/DocBook/{ => media}/dvb/intro.xml    |    0
1082  Documentation/DocBook/{ => media}/dvb/kdapi.xml    |    0
1083  Documentation/DocBook/{ => media}/dvb/net.xml      |    0
1084  Documentation/DocBook/{ => media}/dvb/video.xml    |    0
1085  Documentation/DocBook/{ => media}/v4l/.gitignore   |    0
1086  Documentation/DocBook/{ => media}/v4l/bayer.pdf    |  Bin 12116 -> 12116 bytes
1087  Documentation/DocBook/{ => media}/v4l/bayer.png    |  Bin 9725 -> 9725 bytes
1088  Documentation/DocBook/{ => media}/v4l/biblio.xml   |    0
1089  .../DocBook/{ => media}/v4l/capture.c.xml          |    0
1090  Documentation/DocBook/{ => media}/v4l/common.xml   |    0
1091  Documentation/DocBook/{ => media}/v4l/compat.xml   |    0
1092  Documentation/DocBook/{ => media}/v4l/controls.xml |    0
1093  Documentation/DocBook/{ => media}/v4l/crop.gif     |  Bin 5967 -> 5967 bytes
1094  Documentation/DocBook/{ => media}/v4l/crop.pdf     |  Bin 5846 -> 5846 bytes
1095  .../DocBook/{ => media}/v4l/dev-capture.xml        |    0
1096  .../DocBook/{ => media}/v4l/dev-codec.xml          |    0
1097  .../DocBook/{ => media}/v4l/dev-effect.xml         |    0
1098  .../DocBook/{ => media}/v4l/dev-event.xml          |    0
1099  Documentation/DocBook/{ => media}/v4l/dev-osd.xml  |    0
1100  .../DocBook/{ => media}/v4l/dev-output.xml         |    0
1101  .../DocBook/{ => media}/v4l/dev-overlay.xml        |    0
1102  .../DocBook/{ => media}/v4l/dev-radio.xml          |    0
1103  .../DocBook/{ => media}/v4l/dev-raw-vbi.xml        |    0
1104  Documentation/DocBook/{ => media}/v4l/dev-rds.xml  |    0
1105  .../DocBook/{ => media}/v4l/dev-sliced-vbi.xml     |    0
1106  .../DocBook/{ => media}/v4l/dev-subdev.xml         |    0
1107  .../DocBook/{ => media}/v4l/dev-teletext.xml       |    0
1108  Documentation/DocBook/{ => media}/v4l/driver.xml   |    0
1109  .../DocBook/{ => media}/v4l/fdl-appendix.xml       |    0
1110  .../DocBook/{ => media}/v4l/fieldseq_bt.gif        |  Bin 25430 -> 25430 bytes
1111  .../DocBook/{ => media}/v4l/fieldseq_bt.pdf        |  Bin 9185 -> 9185 bytes
1112  .../DocBook/{ => media}/v4l/fieldseq_tb.gif        |  Bin 25323 -> 25323 bytes
1113  .../DocBook/{ => media}/v4l/fieldseq_tb.pdf        |  Bin 9173 -> 9173 bytes
1114  .../DocBook/{ => media}/v4l/func-close.xml         |    0
1115  .../DocBook/{ => media}/v4l/func-ioctl.xml         |    0
1116  .../DocBook/{ => media}/v4l/func-mmap.xml          |    0
1117  .../DocBook/{ => media}/v4l/func-munmap.xml        |    0
1118  .../DocBook/{ => media}/v4l/func-open.xml          |    0
1119  .../DocBook/{ => media}/v4l/func-poll.xml          |    0
1120  .../DocBook/{ => media}/v4l/func-read.xml          |    0
1121  .../DocBook/{ => media}/v4l/func-select.xml        |    0
1122  .../DocBook/{ => media}/v4l/func-write.xml         |    0
1123  Documentation/DocBook/{ => media}/v4l/io.xml       |    0
1124  .../DocBook/{ => media}/v4l/keytable.c.xml         |    0
1125  Documentation/DocBook/{ => media}/v4l/libv4l.xml   |    0
1126  .../{ => media}/v4l/lirc_device_interface.xml      |    0
1127  .../DocBook/{ => media}/v4l/media-controller.xml   |    0
1128  .../DocBook/{ => media}/v4l/media-func-close.xml   |    0
1129  .../DocBook/{ => media}/v4l/media-func-ioctl.xml   |    0
1130  .../DocBook/{ => media}/v4l/media-func-open.xml    |    0
1131  .../{ => media}/v4l/media-ioc-device-info.xml      |    0
1132  .../{ => media}/v4l/media-ioc-enum-entities.xml    |    0
1133  .../{ => media}/v4l/media-ioc-enum-links.xml       |    0
1134  .../{ => media}/v4l/media-ioc-setup-link.xml       |    0
1135  Documentation/DocBook/{ => media}/v4l/nv12mt.gif   |  Bin 2108 -> 2108 bytes
1136  .../DocBook/{ => media}/v4l/nv12mt_example.gif     |  Bin 6858 -> 6858 bytes
1137  Documentation/DocBook/{ => media}/v4l/pipeline.pdf |  Bin 20276 -> 20276 bytes
1138  Documentation/DocBook/{ => media}/v4l/pipeline.png |  Bin 12130 -> 12130 bytes
1139  .../DocBook/{ => media}/v4l/pixfmt-grey.xml        |    0
1140  .../DocBook/{ => media}/v4l/pixfmt-m420.xml        |    0
1141  .../DocBook/{ => media}/v4l/pixfmt-nv12.xml        |    0
1142  .../DocBook/{ => media}/v4l/pixfmt-nv12m.xml       |    0
1143  .../DocBook/{ => media}/v4l/pixfmt-nv12mt.xml      |    0
1144  .../DocBook/{ => media}/v4l/pixfmt-nv16.xml        |    0
1145  .../DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml  |    0
1146  .../DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml  |    0
1147  .../DocBook/{ => media}/v4l/pixfmt-sbggr16.xml     |    0
1148  .../DocBook/{ => media}/v4l/pixfmt-sbggr8.xml      |    0
1149  .../DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml      |    0
1150  .../DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml      |    0
1151  .../DocBook/{ => media}/v4l/pixfmt-srggb10.xml     |    0
1152  .../DocBook/{ => media}/v4l/pixfmt-srggb12.xml     |    0
1153  .../DocBook/{ => media}/v4l/pixfmt-srggb8.xml      |    0
1154  .../DocBook/{ => media}/v4l/pixfmt-uyvy.xml        |    0
1155  .../DocBook/{ => media}/v4l/pixfmt-vyuy.xml        |    0
1156  .../DocBook/{ => media}/v4l/pixfmt-y10.xml         |    0
1157  .../DocBook/{ => media}/v4l/pixfmt-y10b.xml        |    0
1158  .../DocBook/{ => media}/v4l/pixfmt-y12.xml         |    0
1159  .../DocBook/{ => media}/v4l/pixfmt-y16.xml         |    0
1160  .../DocBook/{ => media}/v4l/pixfmt-y41p.xml        |    0
1161  .../DocBook/{ => media}/v4l/pixfmt-yuv410.xml      |    0
1162  .../DocBook/{ => media}/v4l/pixfmt-yuv411p.xml     |    0
1163  .../DocBook/{ => media}/v4l/pixfmt-yuv420.xml      |    0
1164  .../DocBook/{ => media}/v4l/pixfmt-yuv420m.xml     |    0
1165  .../DocBook/{ => media}/v4l/pixfmt-yuv422p.xml     |    0
1166  .../DocBook/{ => media}/v4l/pixfmt-yuyv.xml        |    0
1167  .../DocBook/{ => media}/v4l/pixfmt-yvyu.xml        |    0
1168  Documentation/DocBook/{ => media}/v4l/pixfmt.xml   |    0
1169  .../DocBook/{ => media}/v4l/planar-apis.xml        |    0
1170  .../DocBook/{ => media}/v4l/remote_controllers.xml |    0
1171  .../DocBook/{ => media}/v4l/subdev-formats.xml     |    0
1172  Documentation/DocBook/{ => media}/v4l/v4l2.xml     |    0
1173  .../DocBook/{ => media}/v4l/v4l2grab.c.xml         |    0
1174  Documentation/DocBook/{ => media}/v4l/vbi_525.gif  |  Bin 4741 -> 4741 bytes
1175  Documentation/DocBook/{ => media}/v4l/vbi_525.pdf  |  Bin 3395 -> 3395 bytes
1176  Documentation/DocBook/{ => media}/v4l/vbi_625.gif  |  Bin 5095 -> 5095 bytes
1177  Documentation/DocBook/{ => media}/v4l/vbi_625.pdf  |  Bin 3683 -> 3683 bytes
1178  .../DocBook/{ => media}/v4l/vbi_hsync.gif          |  Bin 2400 -> 2400 bytes
1179  .../DocBook/{ => media}/v4l/vbi_hsync.pdf          |  Bin 7405 -> 7405 bytes
1180  .../DocBook/{ => media}/v4l/vidioc-cropcap.xml     |    0
1181  .../{ => media}/v4l/vidioc-dbg-g-chip-ident.xml    |    0
1182  .../{ => media}/v4l/vidioc-dbg-g-register.xml      |    0
1183  .../DocBook/{ => media}/v4l/vidioc-dqevent.xml     |    0
1184  .../DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml |    0
1185  .../{ => media}/v4l/vidioc-enum-dv-presets.xml     |    0
1186  .../DocBook/{ => media}/v4l/vidioc-enum-fmt.xml    |    0
1187  .../{ => media}/v4l/vidioc-enum-frameintervals.xml |    0
1188  .../{ => media}/v4l/vidioc-enum-framesizes.xml     |    0
1189  .../DocBook/{ => media}/v4l/vidioc-enumaudio.xml   |    0
1190  .../{ => media}/v4l/vidioc-enumaudioout.xml        |    0
1191  .../DocBook/{ => media}/v4l/vidioc-enuminput.xml   |    0
1192  .../DocBook/{ => media}/v4l/vidioc-enumoutput.xml  |    0
1193  .../DocBook/{ => media}/v4l/vidioc-enumstd.xml     |    0
1194  .../DocBook/{ => media}/v4l/vidioc-g-audio.xml     |    0
1195  .../DocBook/{ => media}/v4l/vidioc-g-audioout.xml  |    0
1196  .../DocBook/{ => media}/v4l/vidioc-g-crop.xml      |    0
1197  .../DocBook/{ => media}/v4l/vidioc-g-ctrl.xml      |    7 +
1198  .../DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml |    0
1199  .../{ => media}/v4l/vidioc-g-dv-timings.xml        |    0
1200  .../DocBook/{ => media}/v4l/vidioc-g-enc-index.xml |    0
1201  .../DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml |    7 +
1202  .../DocBook/{ => media}/v4l/vidioc-g-fbuf.xml      |    0
1203  .../DocBook/{ => media}/v4l/vidioc-g-fmt.xml       |    0
1204  .../DocBook/{ => media}/v4l/vidioc-g-frequency.xml |    0
1205  .../DocBook/{ => media}/v4l/vidioc-g-input.xml     |    0
1206  .../DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml  |    0
1207  .../DocBook/{ => media}/v4l/vidioc-g-modulator.xml |    0
1208  .../DocBook/{ => media}/v4l/vidioc-g-output.xml    |    0
1209  .../DocBook/{ => media}/v4l/vidioc-g-parm.xml      |    0
1210  .../DocBook/{ => media}/v4l/vidioc-g-priority.xml  |    0
1211  .../{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml    |    0
1212  .../DocBook/{ => media}/v4l/vidioc-g-std.xml       |    0
1213  .../DocBook/{ => media}/v4l/vidioc-g-tuner.xml     |    0
1214  .../DocBook/{ => media}/v4l/vidioc-log-status.xml  |    0
1215  .../DocBook/{ => media}/v4l/vidioc-overlay.xml     |    0
1216  .../DocBook/{ => media}/v4l/vidioc-qbuf.xml        |    0
1217  .../{ => media}/v4l/vidioc-query-dv-preset.xml     |    0
1218  .../DocBook/{ => media}/v4l/vidioc-querybuf.xml    |    0
1219  .../DocBook/{ => media}/v4l/vidioc-querycap.xml    |    0
1220  .../DocBook/{ => media}/v4l/vidioc-queryctrl.xml   |    0
1221  .../DocBook/{ => media}/v4l/vidioc-querystd.xml    |    0
1222  .../DocBook/{ => media}/v4l/vidioc-reqbufs.xml     |    0
1223  .../{ => media}/v4l/vidioc-s-hw-freq-seek.xml      |    0
1224  .../DocBook/{ => media}/v4l/vidioc-streamon.xml    |    0
1225  .../v4l/vidioc-subdev-enum-frame-interval.xml      |    0
1226  .../v4l/vidioc-subdev-enum-frame-size.xml          |    0
1227  .../v4l/vidioc-subdev-enum-mbus-code.xml           |    0
1228  .../{ => media}/v4l/vidioc-subdev-g-crop.xml       |    0
1229  .../{ => media}/v4l/vidioc-subdev-g-fmt.xml        |    0
1230  .../v4l/vidioc-subdev-g-frame-interval.xml         |    0
1231  .../{ => media}/v4l/vidioc-subscribe-event.xml     |    0
1232  .../DocBook/{media.tmpl => media_api.tmpl}         |    0
1233  Documentation/DocBook/v4l/videodev2.h.xml          | 1946 --------------------
1234  Documentation/video4linux/CARDLIST.cx23885         |    2 +
1235  Documentation/video4linux/CARDLIST.cx88            |    1 +
1236  Documentation/video4linux/CARDLIST.em28xx          |    2 +
1237  Documentation/video4linux/CARDLIST.saa7134         |    4 +
1238  Documentation/video4linux/CARDLIST.tuner           |    1 +
1239  Documentation/video4linux/CARDLIST.usbvision       |    2 +
1240  drivers/media/Kconfig                              |   12 +-
1241  drivers/media/dvb/dvb-core/Makefile                |    4 +-
1242  drivers/media/dvb/dvb-core/dvb_net.h               |   21 +-
1243  drivers/media/dvb/dvb-usb/anysee.c                 |   86 +-
1244  drivers/media/dvb/dvb-usb/anysee.h                 |   16 +-
1245  drivers/media/dvb/dvb-usb/dvb-usb.h                |    2 +-
1246  drivers/media/dvb/frontends/cx24113.c              |   20 +-
1247  drivers/media/dvb/frontends/cxd2820r.h             |    4 +-
1248  drivers/media/dvb/frontends/cxd2820r_core.c        |   22 +-
1249  drivers/media/dvb/frontends/cxd2820r_priv.h        |    4 +-
1250  drivers/media/dvb/frontends/itd1000.c              |   25 +-
1251  drivers/media/media-devnode.c                      |    4 +-
1252  drivers/media/radio/radio-sf16fmr2.c               |  531 ++----
1253  drivers/media/radio/si470x/radio-si470x-usb.c      |    4 +-
1254  drivers/media/video/cx23885/cx23885-input.c        |    3 +
1255  drivers/media/video/em28xx/em28xx-cards.c          |   12 +-
1256  drivers/media/video/em28xx/em28xx-dvb.c            |    2 +-
1257  drivers/media/video/em28xx/em28xx-input.c          |    1 +
1258  drivers/media/video/em28xx/em28xx.h                |    2 +-
1259  drivers/media/video/gspca/coarse_expo_autogain.h   |  116 --
1260  drivers/media/video/gspca/ov519.c                  |  117 +-
1261  drivers/media/video/gspca/sonixj.c                 |    2 +-
1262  drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h   |    2 +-
1263  drivers/media/video/ivtv/ivtv-driver.c             |   10 +-
1264  drivers/media/video/ivtv/ivtv-firmware.c           |   11 +-
1265  drivers/media/video/ivtv/ivtv-ioctl.c              |  129 +-
1266  drivers/media/video/ivtv/ivtv-ioctl.h              |    3 +-
1267  drivers/media/video/ivtv/ivtv-streams.c            |    4 +-
1268  drivers/media/video/ivtv/ivtv-vbi.c                |    2 +-
1269  drivers/media/video/ivtv/ivtvfb.c                  |   33 +-
1270  drivers/media/video/omap3isp/isp.c                 |    2 +-
1271  drivers/media/video/saa7164/saa7164-encoder.c      |    6 +-
1272  drivers/media/video/saa7164/saa7164-vbi.c          |    6 +-
1273  drivers/media/video/soc_camera.c                   |    2 +-
1274  drivers/media/video/uvc/uvc_entity.c               |    2 +-
1275  drivers/media/video/v4l2-ioctl.c                   |    4 +-
1276  drivers/media/video/videobuf-dma-sg.c              |    5 +-
1277  drivers/media/video/videobuf2-dma-sg.c             |    8 +-
1278  drivers/media/video/videobuf2-memops.c             |    6 +-
1279  include/media/v4l2-dev.h                           |    4 +-
1280  include/sound/tea575x-tuner.h                      |    6 +-
1281  sound/i2c/other/tea575x-tuner.c                    |  106 +-
1282  sound/pci/Kconfig                                  |    4 +-
1283  218 files changed, 880 insertions(+), 3738 deletions(-)
1284  delete mode 100644 Documentation/DocBook/dvb/frontend.h.xml
1285  delete mode 100644 Documentation/DocBook/media-entities.tmpl
1286  delete mode 100644 Documentation/DocBook/media-indices.tmpl
1287  create mode 100644 Documentation/DocBook/media/Makefile
1288  rename Documentation/DocBook/{ => media}/dvb/.gitignore (100%)
1289  rename Documentation/DocBook/{ => media}/dvb/audio.xml (100%)
1290  rename Documentation/DocBook/{ => media}/dvb/ca.xml (100%)
1291  rename Documentation/DocBook/{ => media}/dvb/demux.xml (100%)
1292  rename Documentation/DocBook/{ => media}/dvb/dvbapi.xml (100%)
1293  rename Documentation/DocBook/{ => media}/dvb/dvbproperty.xml (100%)
1294  rename Documentation/DocBook/{ => media}/dvb/dvbstb.pdf (100%)
1295  rename Documentation/DocBook/{ => media}/dvb/dvbstb.png (100%)
1296  rename Documentation/DocBook/{ => media}/dvb/examples.xml (100%)
1297  rename Documentation/DocBook/{ => media}/dvb/frontend.xml (100%)
1298  rename Documentation/DocBook/{ => media}/dvb/intro.xml (100%)
1299  rename Documentation/DocBook/{ => media}/dvb/kdapi.xml (100%)
1300  rename Documentation/DocBook/{ => media}/dvb/net.xml (100%)
1301  rename Documentation/DocBook/{ => media}/dvb/video.xml (100%)
1302  rename Documentation/DocBook/{ => media}/v4l/.gitignore (100%)
1303  rename Documentation/DocBook/{ => media}/v4l/bayer.pdf (100%)
1304  rename Documentation/DocBook/{ => media}/v4l/bayer.png (100%)
1305  rename Documentation/DocBook/{ => media}/v4l/biblio.xml (100%)
1306  rename Documentation/DocBook/{ => media}/v4l/capture.c.xml (100%)
1307  rename Documentation/DocBook/{ => media}/v4l/common.xml (100%)
1308  rename Documentation/DocBook/{ => media}/v4l/compat.xml (100%)
1309  rename Documentation/DocBook/{ => media}/v4l/controls.xml (100%)
1310  rename Documentation/DocBook/{ => media}/v4l/crop.gif (100%)
1311  rename Documentation/DocBook/{ => media}/v4l/crop.pdf (100%)
1312  rename Documentation/DocBook/{ => media}/v4l/dev-capture.xml (100%)
1313  rename Documentation/DocBook/{ => media}/v4l/dev-codec.xml (100%)
1314  rename Documentation/DocBook/{ => media}/v4l/dev-effect.xml (100%)
1315  rename Documentation/DocBook/{ => media}/v4l/dev-event.xml (100%)
1316  rename Documentation/DocBook/{ => media}/v4l/dev-osd.xml (100%)
1317  rename Documentation/DocBook/{ => media}/v4l/dev-output.xml (100%)
1318  rename Documentation/DocBook/{ => media}/v4l/dev-overlay.xml (100%)
1319  rename Documentation/DocBook/{ => media}/v4l/dev-radio.xml (100%)
1320  rename Documentation/DocBook/{ => media}/v4l/dev-raw-vbi.xml (100%)
1321  rename Documentation/DocBook/{ => media}/v4l/dev-rds.xml (100%)
1322  rename Documentation/DocBook/{ => media}/v4l/dev-sliced-vbi.xml (100%)
1323  rename Documentation/DocBook/{ => media}/v4l/dev-subdev.xml (100%)
1324  rename Documentation/DocBook/{ => media}/v4l/dev-teletext.xml (100%)
1325  rename Documentation/DocBook/{ => media}/v4l/driver.xml (100%)
1326  rename Documentation/DocBook/{ => media}/v4l/fdl-appendix.xml (100%)
1327  rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.gif (100%)
1328  rename Documentation/DocBook/{ => media}/v4l/fieldseq_bt.pdf (100%)
1329  rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.gif (100%)
1330  rename Documentation/DocBook/{ => media}/v4l/fieldseq_tb.pdf (100%)
1331  rename Documentation/DocBook/{ => media}/v4l/func-close.xml (100%)
1332  rename Documentation/DocBook/{ => media}/v4l/func-ioctl.xml (100%)
1333  rename Documentation/DocBook/{ => media}/v4l/func-mmap.xml (100%)
1334  rename Documentation/DocBook/{ => media}/v4l/func-munmap.xml (100%)
1335  rename Documentation/DocBook/{ => media}/v4l/func-open.xml (100%)
1336  rename Documentation/DocBook/{ => media}/v4l/func-poll.xml (100%)
1337  rename Documentation/DocBook/{ => media}/v4l/func-read.xml (100%)
1338  rename Documentation/DocBook/{ => media}/v4l/func-select.xml (100%)
1339  rename Documentation/DocBook/{ => media}/v4l/func-write.xml (100%)
1340  rename Documentation/DocBook/{ => media}/v4l/io.xml (100%)
1341  rename Documentation/DocBook/{ => media}/v4l/keytable.c.xml (100%)
1342  rename Documentation/DocBook/{ => media}/v4l/libv4l.xml (100%)
1343  rename Documentation/DocBook/{ => media}/v4l/lirc_device_interface.xml (100%)
1344  rename Documentation/DocBook/{ => media}/v4l/media-controller.xml (100%)
1345  rename Documentation/DocBook/{ => media}/v4l/media-func-close.xml (100%)
1346  rename Documentation/DocBook/{ => media}/v4l/media-func-ioctl.xml (100%)
1347  rename Documentation/DocBook/{ => media}/v4l/media-func-open.xml (100%)
1348  rename Documentation/DocBook/{ => media}/v4l/media-ioc-device-info.xml (100%)
1349  rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-entities.xml (100%)
1350  rename Documentation/DocBook/{ => media}/v4l/media-ioc-enum-links.xml (100%)
1351  rename Documentation/DocBook/{ => media}/v4l/media-ioc-setup-link.xml (100%)
1352  rename Documentation/DocBook/{ => media}/v4l/nv12mt.gif (100%)
1353  rename Documentation/DocBook/{ => media}/v4l/nv12mt_example.gif (100%)
1354  rename Documentation/DocBook/{ => media}/v4l/pipeline.pdf (100%)
1355  rename Documentation/DocBook/{ => media}/v4l/pipeline.png (100%)
1356  rename Documentation/DocBook/{ => media}/v4l/pixfmt-grey.xml (100%)
1357  rename Documentation/DocBook/{ => media}/v4l/pixfmt-m420.xml (100%)
1358  rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12.xml (100%)
1359  rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12m.xml (100%)
1360  rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv12mt.xml (100%)
1361  rename Documentation/DocBook/{ => media}/v4l/pixfmt-nv16.xml (100%)
1362  rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-rgb.xml (100%)
1363  rename Documentation/DocBook/{ => media}/v4l/pixfmt-packed-yuv.xml (100%)
1364  rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr16.xml (100%)
1365  rename Documentation/DocBook/{ => media}/v4l/pixfmt-sbggr8.xml (100%)
1366  rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgbrg8.xml (100%)
1367  rename Documentation/DocBook/{ => media}/v4l/pixfmt-sgrbg8.xml (100%)
1368  rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb10.xml (100%)
1369  rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb12.xml (100%)
1370  rename Documentation/DocBook/{ => media}/v4l/pixfmt-srggb8.xml (100%)
1371  rename Documentation/DocBook/{ => media}/v4l/pixfmt-uyvy.xml (100%)
1372  rename Documentation/DocBook/{ => media}/v4l/pixfmt-vyuy.xml (100%)
1373  rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10.xml (100%)
1374  rename Documentation/DocBook/{ => media}/v4l/pixfmt-y10b.xml (100%)
1375  rename Documentation/DocBook/{ => media}/v4l/pixfmt-y12.xml (100%)
1376  rename Documentation/DocBook/{ => media}/v4l/pixfmt-y16.xml (100%)
1377  rename Documentation/DocBook/{ => media}/v4l/pixfmt-y41p.xml (100%)
1378  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv410.xml (100%)
1379  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv411p.xml (100%)
1380  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420.xml (100%)
1381  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv420m.xml (100%)
1382  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuv422p.xml (100%)
1383  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yuyv.xml (100%)
1384  rename Documentation/DocBook/{ => media}/v4l/pixfmt-yvyu.xml (100%)
1385  rename Documentation/DocBook/{ => media}/v4l/pixfmt.xml (100%)
1386  rename Documentation/DocBook/{ => media}/v4l/planar-apis.xml (100%)
1387  rename Documentation/DocBook/{ => media}/v4l/remote_controllers.xml (100%)
1388  rename Documentation/DocBook/{ => media}/v4l/subdev-formats.xml (100%)
1389  rename Documentation/DocBook/{ => media}/v4l/v4l2.xml (100%)
1390  rename Documentation/DocBook/{ => media}/v4l/v4l2grab.c.xml (100%)
1391  rename Documentation/DocBook/{ => media}/v4l/vbi_525.gif (100%)
1392  rename Documentation/DocBook/{ => media}/v4l/vbi_525.pdf (100%)
1393  rename Documentation/DocBook/{ => media}/v4l/vbi_625.gif (100%)
1394  rename Documentation/DocBook/{ => media}/v4l/vbi_625.pdf (100%)
1395  rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.gif (100%)
1396  rename Documentation/DocBook/{ => media}/v4l/vbi_hsync.pdf (100%)
1397  rename Documentation/DocBook/{ => media}/v4l/vidioc-cropcap.xml (100%)
1398  rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-chip-ident.xml (100%)
1399  rename Documentation/DocBook/{ => media}/v4l/vidioc-dbg-g-register.xml (100%)
1400  rename Documentation/DocBook/{ => media}/v4l/vidioc-dqevent.xml (100%)
1401  rename Documentation/DocBook/{ => media}/v4l/vidioc-encoder-cmd.xml (100%)
1402  rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-dv-presets.xml (100%)
1403  rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-fmt.xml (100%)
1404  rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-frameintervals.xml (100%)
1405  rename Documentation/DocBook/{ => media}/v4l/vidioc-enum-framesizes.xml (100%)
1406  rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudio.xml (100%)
1407  rename Documentation/DocBook/{ => media}/v4l/vidioc-enumaudioout.xml (100%)
1408  rename Documentation/DocBook/{ => media}/v4l/vidioc-enuminput.xml (100%)
1409  rename Documentation/DocBook/{ => media}/v4l/vidioc-enumoutput.xml (100%)
1410  rename Documentation/DocBook/{ => media}/v4l/vidioc-enumstd.xml (100%)
1411  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audio.xml (100%)
1412  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-audioout.xml (100%)
1413  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-crop.xml (100%)
1414  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ctrl.xml (94%)
1415  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-preset.xml (100%)
1416  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-dv-timings.xml (100%)
1417  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-enc-index.xml (100%)
1418  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-ext-ctrls.xml (98%)
1419  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fbuf.xml (100%)
1420  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-fmt.xml (100%)
1421  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-frequency.xml (100%)
1422  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-input.xml (100%)
1423  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-jpegcomp.xml (100%)
1424  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-modulator.xml (100%)
1425  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-output.xml (100%)
1426  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-parm.xml (100%)
1427  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-priority.xml (100%)
1428  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-sliced-vbi-cap.xml (100%)
1429  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-std.xml (100%)
1430  rename Documentation/DocBook/{ => media}/v4l/vidioc-g-tuner.xml (100%)
1431  rename Documentation/DocBook/{ => media}/v4l/vidioc-log-status.xml (100%)
1432  rename Documentation/DocBook/{ => media}/v4l/vidioc-overlay.xml (100%)
1433  rename Documentation/DocBook/{ => media}/v4l/vidioc-qbuf.xml (100%)
1434  rename Documentation/DocBook/{ => media}/v4l/vidioc-query-dv-preset.xml (100%)
1435  rename Documentation/DocBook/{ => media}/v4l/vidioc-querybuf.xml (100%)
1436  rename Documentation/DocBook/{ => media}/v4l/vidioc-querycap.xml (100%)
1437  rename Documentation/DocBook/{ => media}/v4l/vidioc-queryctrl.xml (100%)
1438  rename Documentation/DocBook/{ => media}/v4l/vidioc-querystd.xml (100%)
1439  rename Documentation/DocBook/{ => media}/v4l/vidioc-reqbufs.xml (100%)
1440  rename Documentation/DocBook/{ => media}/v4l/vidioc-s-hw-freq-seek.xml (100%)
1441  rename Documentation/DocBook/{ => media}/v4l/vidioc-streamon.xml (100%)
1442  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-interval.xml (100%)
1443  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-frame-size.xml (100%)
1444  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-enum-mbus-code.xml (100%)
1445  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-crop.xml (100%)
1446  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-fmt.xml (100%)
1447  rename Documentation/DocBook/{ => media}/v4l/vidioc-subdev-g-frame-interval.xml (100%)
1448  rename Documentation/DocBook/{ => media}/v4l/vidioc-subscribe-event.xml (100%)
1449  rename Documentation/DocBook/{media.tmpl => media_api.tmpl} (100%)
1450  delete mode 100644 Documentation/DocBook/v4l/videodev2.h.xml
1451  delete mode 100644 drivers/media/video/gspca/coarse_expo_autogain.h
1452 Merging kbuild/for-next
1453 $ git merge kbuild/for-next
1454 Auto-merging scripts/Makefile.modpost
1455 Merge made by recursive.
1456  scripts/Makefile.modpost   |    2 +-
1457  scripts/kconfig/confdata.c |   27 +++++++++++++++++++++++++++
1458  2 files changed, 28 insertions(+), 1 deletions(-)
1459 Merging kconfig/for-next
1460 $ git merge kconfig/for-next
1461 Already up-to-date!
1462 Merge made by recursive.
1463 Merging ide/master
1464 $ git merge ide/master
1465 Already up-to-date.
1466 Merging libata/NEXT
1467 $ git merge libata/NEXT
1468 Already up-to-date.
1469 Merging infiniband/for-next
1470 $ git merge infiniband/for-next
1471 Already up-to-date.
1472 Merging acpi/test
1473 $ git merge acpi/test
1474 Already up-to-date.
1475 Merging idle-test/idle-test
1476 $ git merge idle-test/idle-test
1477 Resolved 'arch/x86/kernel/process.c' using previous resolution.
1478 Auto-merging arch/x86/kernel/process.c
1479 CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
1480 Automatic merge failed; fix conflicts and then commit the result.
1481 $ git commit -v -a
1482 [master d5c413a] Merge remote-tracking branch 'idle-test/idle-test'
1483 $ git diff -M --stat --summary HEAD^..
1484  arch/x86/kernel/process.c |    2 +-
1485  1 files changed, 1 insertions(+), 1 deletions(-)
1486 Merging powertools/tools-test
1487 $ git merge powertools/tools-test
1488 Already up-to-date.
1489 Merging cpupowerutils/master
1490 $ git merge cpupowerutils/master
1491 Auto-merging CREDITS
1492 Auto-merging MAINTAINERS
1493 Merge made by recursive.
1494  CREDITS                                            |   17 +-
1495  MAINTAINERS                                        |    6 +
1496  tools/power/cpupower/.gitignore                    |   22 +
1497  tools/power/cpupower/Makefile                      |  279 ++++++
1498  tools/power/cpupower/README                        |   49 +
1499  tools/power/cpupower/ToDo                          |   11 +
1500  tools/power/cpupower/bench/Makefile                |   29 +
1501  tools/power/cpupower/bench/README-BENCH            |  124 +++
1502  tools/power/cpupower/bench/benchmark.c             |  194 ++++
1503  tools/power/cpupower/bench/benchmark.h             |   29 +
1504  tools/power/cpupower/bench/config.h                |   36 +
1505  tools/power/cpupower/bench/cpufreq-bench_plot.sh   |  104 +++
1506  tools/power/cpupower/bench/cpufreq-bench_script.sh |  101 ++
1507  tools/power/cpupower/bench/example.cfg             |   11 +
1508  tools/power/cpupower/bench/main.c                  |  202 ++++
1509  tools/power/cpupower/bench/parse.c                 |  225 +++++
1510  tools/power/cpupower/bench/parse.h                 |   53 ++
1511  tools/power/cpupower/bench/system.c                |  191 ++++
1512  tools/power/cpupower/bench/system.h                |   29 +
1513  tools/power/cpupower/debug/i386/Makefile           |   20 +
1514  tools/power/cpupower/debug/i386/centrino-decode.c  |  113 +++
1515  tools/power/cpupower/debug/i386/dump_psb.c         |  196 ++++
1516  tools/power/cpupower/debug/i386/intel_gsic.c       |   78 ++
1517  .../power/cpupower/debug/i386/powernow-k8-decode.c |   96 ++
1518  tools/power/cpupower/debug/kernel/Makefile         |   23 +
1519  .../power/cpupower/debug/kernel/cpufreq-test_tsc.c |  113 +++
1520  tools/power/cpupower/debug/x86_64/Makefile         |   14 +
1521  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 +
1522  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 +
1523  tools/power/cpupower/lib/cpufreq.c                 |  208 +++++
1524  tools/power/cpupower/lib/cpufreq.h                 |  223 +++++
1525  tools/power/cpupower/lib/sysfs.c                   |  672 ++++++++++++++
1526  tools/power/cpupower/lib/sysfs.h                   |   31 +
1527  tools/power/cpupower/man/cpupower-frequency-info.1 |   76 ++
1528  tools/power/cpupower/man/cpupower-frequency-set.1  |   54 ++
1529  tools/power/cpupower/man/cpupower-info.1           |   19 +
1530  tools/power/cpupower/man/cpupower-monitor.1        |  179 ++++
1531  tools/power/cpupower/man/cpupower-set.1            |  103 +++
1532  tools/power/cpupower/man/cpupower.1                |   72 ++
1533  tools/power/cpupower/po/cs.po                      |  944 +++++++++++++++++++
1534  tools/power/cpupower/po/de.po                      |  961 ++++++++++++++++++++
1535  tools/power/cpupower/po/fr.po                      |  947 +++++++++++++++++++
1536  tools/power/cpupower/po/it.po                      |  961 ++++++++++++++++++++
1537  tools/power/cpupower/po/pt.po                      |  957 +++++++++++++++++++
1538  tools/power/cpupower/utils/builtin.h               |   18 +
1539  tools/power/cpupower/utils/cpufreq-info.c          |  678 ++++++++++++++
1540  tools/power/cpupower/utils/cpufreq-set.c           |  358 ++++++++
1541  tools/power/cpupower/utils/cpuidle-info.c          |  244 +++++
1542  tools/power/cpupower/utils/cpupower-info.c         |  153 ++++
1543  tools/power/cpupower/utils/cpupower-set.c          |  153 ++++
1544  tools/power/cpupower/utils/cpupower.c              |  203 ++++
1545  tools/power/cpupower/utils/helpers/amd.c           |  137 +++
1546  tools/power/cpupower/utils/helpers/bitmask.c       |  292 ++++++
1547  tools/power/cpupower/utils/helpers/bitmask.h       |   33 +
1548  tools/power/cpupower/utils/helpers/cpuid.c         |  143 +++
1549  tools/power/cpupower/utils/helpers/helpers.h       |  180 ++++
1550  tools/power/cpupower/utils/helpers/misc.c          |   35 +
1551  tools/power/cpupower/utils/helpers/msr.c           |  122 +++
1552  tools/power/cpupower/utils/helpers/pci.c           |   44 +
1553  tools/power/cpupower/utils/helpers/sysfs.c         |  358 ++++++++
1554  tools/power/cpupower/utils/helpers/sysfs.h         |   28 +
1555  tools/power/cpupower/utils/helpers/topology.c      |  108 +++
1556  .../cpupower/utils/idle_monitor/amd_fam14h_idle.c  |  338 +++++++
1557  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |  196 ++++
1558  .../cpupower/utils/idle_monitor/cpupower-monitor.c |  448 +++++++++
1559  .../cpupower/utils/idle_monitor/cpupower-monitor.h |   68 ++
1560  .../cpupower/utils/idle_monitor/idle_monitors.def  |    7 +
1561  .../cpupower/utils/idle_monitor/idle_monitors.h    |   18 +
1562  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  255 ++++++
1563  tools/power/cpupower/utils/idle_monitor/nhm_idle.c |  216 +++++
1564  tools/power/cpupower/utils/idle_monitor/snb_idle.c |  190 ++++
1565  tools/power/cpupower/utils/version-gen.sh          |   35 +
1566  72 files changed, 13831 insertions(+), 1 deletions(-)
1567  create mode 100644 tools/power/cpupower/.gitignore
1568  create mode 100644 tools/power/cpupower/Makefile
1569  create mode 100644 tools/power/cpupower/README
1570  create mode 100644 tools/power/cpupower/ToDo
1571  create mode 100644 tools/power/cpupower/bench/Makefile
1572  create mode 100644 tools/power/cpupower/bench/README-BENCH
1573  create mode 100644 tools/power/cpupower/bench/benchmark.c
1574  create mode 100644 tools/power/cpupower/bench/benchmark.h
1575  create mode 100644 tools/power/cpupower/bench/config.h
1576  create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh
1577  create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh
1578  create mode 100644 tools/power/cpupower/bench/example.cfg
1579  create mode 100644 tools/power/cpupower/bench/main.c
1580  create mode 100644 tools/power/cpupower/bench/parse.c
1581  create mode 100644 tools/power/cpupower/bench/parse.h
1582  create mode 100644 tools/power/cpupower/bench/system.c
1583  create mode 100644 tools/power/cpupower/bench/system.h
1584  create mode 100644 tools/power/cpupower/debug/i386/Makefile
1585  create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c
1586  create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c
1587  create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c
1588  create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c
1589  create mode 100644 tools/power/cpupower/debug/kernel/Makefile
1590  create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
1591  create mode 100644 tools/power/cpupower/debug/x86_64/Makefile
1592  create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1593  create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1594  create mode 100644 tools/power/cpupower/lib/cpufreq.c
1595  create mode 100644 tools/power/cpupower/lib/cpufreq.h
1596  create mode 100644 tools/power/cpupower/lib/sysfs.c
1597  create mode 100644 tools/power/cpupower/lib/sysfs.h
1598  create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1
1599  create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1
1600  create mode 100644 tools/power/cpupower/man/cpupower-info.1
1601  create mode 100644 tools/power/cpupower/man/cpupower-monitor.1
1602  create mode 100644 tools/power/cpupower/man/cpupower-set.1
1603  create mode 100644 tools/power/cpupower/man/cpupower.1
1604  create mode 100644 tools/power/cpupower/po/cs.po
1605  create mode 100644 tools/power/cpupower/po/de.po
1606  create mode 100644 tools/power/cpupower/po/fr.po
1607  create mode 100644 tools/power/cpupower/po/it.po
1608  create mode 100644 tools/power/cpupower/po/pt.po
1609  create mode 100644 tools/power/cpupower/utils/builtin.h
1610  create mode 100644 tools/power/cpupower/utils/cpufreq-info.c
1611  create mode 100644 tools/power/cpupower/utils/cpufreq-set.c
1612  create mode 100644 tools/power/cpupower/utils/cpuidle-info.c
1613  create mode 100644 tools/power/cpupower/utils/cpupower-info.c
1614  create mode 100644 tools/power/cpupower/utils/cpupower-set.c
1615  create mode 100644 tools/power/cpupower/utils/cpupower.c
1616  create mode 100644 tools/power/cpupower/utils/helpers/amd.c
1617  create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c
1618  create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h
1619  create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c
1620  create mode 100644 tools/power/cpupower/utils/helpers/helpers.h
1621  create mode 100644 tools/power/cpupower/utils/helpers/misc.c
1622  create mode 100644 tools/power/cpupower/utils/helpers/msr.c
1623  create mode 100644 tools/power/cpupower/utils/helpers/pci.c
1624  create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c
1625  create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h
1626  create mode 100644 tools/power/cpupower/utils/helpers/topology.c
1627  create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
1628  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
1629  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
1630  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
1631  create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def
1632  create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h
1633  create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
1634  create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c
1635  create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c
1636  create mode 100755 tools/power/cpupower/utils/version-gen.sh
1637 Merging ieee1394/for-next
1638 $ git merge ieee1394/for-next
1639 Merge made by recursive.
1640  drivers/firewire/net.c  |    5 +++--
1641  drivers/firewire/ohci.c |   14 +++++---------
1642  2 files changed, 8 insertions(+), 11 deletions(-)
1643 Merging ubi/linux-next
1644 $ git merge ubi/linux-next
1645 Merge made by recursive.
1646  drivers/mtd/ubi/build.c |   28 +++++-
1647  drivers/mtd/ubi/debug.c |  269 +++++++++++++++++++++++++++++++++++++++++++++--
1648  drivers/mtd/ubi/debug.h |  113 ++++++++++++--------
1649  drivers/mtd/ubi/io.c    |   20 ++--
1650  drivers/mtd/ubi/scan.c  |    2 +-
1651  drivers/mtd/ubi/ubi.h   |    8 ++-
1652  drivers/mtd/ubi/vmt.c   |    2 +-
1653  drivers/mtd/ubi/vtbl.c  |    2 +-
1654  drivers/mtd/ubi/wl.c    |   42 ++++---
1655  9 files changed, 395 insertions(+), 91 deletions(-)
1656 Merging dlm/next
1657 $ git merge dlm/next
1658 Already up-to-date.
1659 Merging swiotlb/master
1660 $ git merge swiotlb/master
1661 Auto-merging drivers/xen/swiotlb-xen.c
1662 Merge made by recursive.
1663  drivers/xen/swiotlb-xen.c |   12 +++++++++---
1664  include/linux/swiotlb.h   |    1 +
1665  lib/swiotlb.c             |    5 +++++
1666  3 files changed, 15 insertions(+), 3 deletions(-)
1667 Merging ibft/master
1668 $ git merge ibft/master
1669 Merge made by recursive.
1670  drivers/firmware/iscsi_ibft_find.c |    2 +-
1671  1 files changed, 1 insertions(+), 1 deletions(-)
1672 Merging scsi/master
1673 $ git merge scsi/master
1674 Already up-to-date.
1675 Merging slave-dma/next
1676 $ git merge slave-dma/next
1677 Removing arch/arm/mach-ep93xx/dma-m2p.c
1678 Merge made by recursive.
1679  Documentation/spi/ep93xx_spi                   |   10 +
1680  arch/arm/mach-ep93xx/Makefile                  |    4 +-
1681  arch/arm/mach-ep93xx/core.c                    |    6 +-
1682  arch/arm/mach-ep93xx/dma-m2p.c                 |  411 -------
1683  arch/arm/mach-ep93xx/dma.c                     |  108 ++
1684  arch/arm/mach-ep93xx/include/mach/dma.h        |  190 ++---
1685  arch/arm/mach-ep93xx/include/mach/ep93xx_spi.h |    2 +
1686  drivers/dma/Kconfig                            |    7 +
1687  drivers/dma/Makefile                           |    1 +
1688  drivers/dma/at_hdmac.c                         |    4 +-
1689  drivers/dma/ep93xx_dma.c                       | 1355 ++++++++++++++++++++++++
1690  drivers/dma/ipu/ipu_idmac.c                    |    6 +-
1691  drivers/dma/pch_dma.c                          |   69 +-
1692  drivers/spi/ep93xx_spi.c                       |  303 +++++-
1693  sound/soc/ep93xx/ep93xx-ac97.c                 |    4 +-
1694  sound/soc/ep93xx/ep93xx-i2s.c                  |    4 +-
1695  sound/soc/ep93xx/ep93xx-pcm.c                  |  137 ++--
1696  17 files changed, 1989 insertions(+), 632 deletions(-)
1697  delete mode 100644 arch/arm/mach-ep93xx/dma-m2p.c
1698  create mode 100644 arch/arm/mach-ep93xx/dma.c
1699  create mode 100644 drivers/dma/ep93xx_dma.c
1700 Merging async_tx/next
1701 $ git merge async_tx/next
1702 Already up-to-date.
1703 Merging net/master
1704 $ git merge net/master
1705 Auto-merging drivers/net/bonding/bond_main.c
1706 Merge made by recursive.
1707  drivers/net/amd8111e.c                  |    2 +-
1708  drivers/net/benet/be_cmds.c             |   65 ++-
1709  drivers/net/benet/be_cmds.h             |    8 +
1710  drivers/net/benet/be_main.c             |    5 +
1711  drivers/net/bnx2x/bnx2x.h               |    2 +-
1712  drivers/net/bnx2x/bnx2x_cmn.c           |   49 +
1713  drivers/net/bnx2x/bnx2x_cmn.h           |    2 +
1714  drivers/net/bnx2x/bnx2x_ethtool.c       |   34 +-
1715  drivers/net/bnx2x/bnx2x_hsi.h           |   18 +-
1716  drivers/net/bnx2x/bnx2x_link.c          | 1650 ++++++++++++++++++-------------
1717  drivers/net/bnx2x/bnx2x_link.h          |   59 +-
1718  drivers/net/bnx2x/bnx2x_main.c          |   43 +-
1719  drivers/net/bnx2x/bnx2x_reg.h           |   25 +
1720  drivers/net/bonding/bond_main.c         |    9 +-
1721  drivers/net/caif/Kconfig                |    9 +
1722  drivers/net/caif/Makefile               |    3 +
1723  drivers/net/caif/caif_hsi.c             | 1220 +++++++++++++++++++++++
1724  drivers/net/cxgb4/cxgb4_main.c          |    2 +-
1725  drivers/net/enic/enic_main.c            |    2 +-
1726  drivers/net/irda/via-ircc.h             |    2 +-
1727  drivers/net/iseries_veth.c              |    4 +-
1728  drivers/net/ixgbe/ixgbe_82599.c         |    4 +-
1729  drivers/net/ixgbe/ixgbe_common.c        |    4 +-
1730  drivers/net/macvlan.c                   |   39 +-
1731  drivers/net/myri10ge/myri10ge.c         |    2 +-
1732  drivers/net/netxen/netxen_nic_hw.c      |    6 +
1733  drivers/net/netxen/netxen_nic_init.c    |    2 +-
1734  drivers/net/ps3_gelic_net.c             |    2 +-
1735  drivers/net/slhc.c                      |    2 +-
1736  drivers/net/sungem.c                    |  891 +++++++----------
1737  drivers/net/sungem.h                    |   25 -
1738  drivers/net/tokenring/3c359.c           |    6 +-
1739  drivers/net/tokenring/ibmtr.c           |    2 +-
1740  drivers/net/tun.c                       |    2 +-
1741  drivers/net/via-velocity.c              |    2 +-
1742  drivers/net/wireless/b43/main.c         |    2 +-
1743  drivers/net/wireless/b43legacy/main.c   |    2 +-
1744  drivers/net/wireless/iwmc3200wifi/fw.c  |    2 +-
1745  drivers/net/wireless/orinoco/main.c     |    2 +-
1746  drivers/net/wireless/rt2x00/rt2800lib.c |    2 +-
1747  drivers/net/wireless/rt2x00/rt2800pci.c |    2 +-
1748  drivers/net/znet.c                      |    2 +-
1749  include/net/caif/caif_hsi.h             |  145 +++
1750  include/net/sctp/sctp.h                 |   15 +-
1751  include/net/sctp/structs.h              |   17 +
1752  include/net/sctp/user.h                 |    1 +
1753  net/8021q/vlan.c                        |   15 +-
1754  net/8021q/vlan_dev.c                    |    4 +-
1755  net/8021q/vlanproc.c                    |    4 +-
1756  net/batman-adv/aggregation.c            |   23 +-
1757  net/batman-adv/aggregation.h            |    5 +-
1758  net/batman-adv/bat_debugfs.c            |   11 +-
1759  net/batman-adv/bat_sysfs.c              |   15 +-
1760  net/batman-adv/bitarray.c               |    6 +-
1761  net/batman-adv/bitarray.h               |    6 +-
1762  net/batman-adv/gateway_client.c         |   19 +-
1763  net/batman-adv/gateway_common.c         |   19 +-
1764  net/batman-adv/hard-interface.c         |   27 +-
1765  net/batman-adv/hard-interface.h         |    6 +-
1766  net/batman-adv/hash.c                   |    7 +-
1767  net/batman-adv/hash.h                   |    6 +-
1768  net/batman-adv/icmp_socket.c            |    4 +-
1769  net/batman-adv/main.c                   |    4 +-
1770  net/batman-adv/main.h                   |   30 +-
1771  net/batman-adv/originator.c             |   12 +-
1772  net/batman-adv/originator.h             |   14 +-
1773  net/batman-adv/ring_buffer.c            |    4 +-
1774  net/batman-adv/ring_buffer.h            |    2 +-
1775  net/batman-adv/routing.c                |   54 +-
1776  net/batman-adv/routing.h                |   12 +-
1777  net/batman-adv/send.c                   |   44 +-
1778  net/batman-adv/send.h                   |   12 +-
1779  net/batman-adv/soft-interface.c         |   22 +-
1780  net/batman-adv/soft-interface.h         |    4 +-
1781  net/batman-adv/translation-table.c      |   44 +-
1782  net/batman-adv/translation-table.h      |   13 +-
1783  net/batman-adv/types.h                  |    8 +-
1784  net/batman-adv/unicast.c                |   30 +-
1785  net/batman-adv/unicast.h                |    8 +-
1786  net/batman-adv/vis.c                    |   91 +-
1787  net/bluetooth/hci_core.c                |    4 +-
1788  net/packet/af_packet.c                  |   41 +-
1789  net/sctp/associola.c                    |    6 +
1790  net/sctp/bind_addr.c                    |   15 +
1791  net/sctp/ipv6.c                         |    2 +
1792  net/sctp/outqueue.c                     |   13 +
1793  net/sctp/protocol.c                     |  152 +++-
1794  net/sctp/sm_make_chunk.c                |   29 +-
1795  net/sctp/socket.c                       |  170 +++-
1796  net/sctp/sysctl.c                       |    7 +
1797  net/sunrpc/auth.c                       |    2 +-
1798  91 files changed, 3773 insertions(+), 1647 deletions(-)
1799  create mode 100644 drivers/net/caif/caif_hsi.c
1800  create mode 100644 include/net/caif/caif_hsi.h
1801 Merging wireless/master
1802 $ git merge wireless/master
1803 Auto-merging drivers/bcma/host_pci.c
1804 Auto-merging drivers/net/wireless/b43/main.c
1805 Auto-merging drivers/net/wireless/b43legacy/main.c
1806 Auto-merging drivers/net/wireless/iwlegacy/iwl-4965.c
1807 Auto-merging drivers/net/wireless/iwlwifi/iwl-2000.c
1808 Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c
1809 Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c
1810 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
1811 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
1812 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
1813 Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c
1814 Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h
1815 Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
1816 Auto-merging drivers/net/wireless/rt2x00/rt2800pci.c
1817 Auto-merging lib/Kconfig
1818 Auto-merging lib/Makefile
1819 Merge made by recursive.
1820  drivers/bcma/Kconfig                               |    5 +
1821  drivers/bcma/Makefile                              |    2 +-
1822  drivers/bcma/bcma_private.h                        |    3 +
1823  drivers/bcma/driver_pci.c                          |   23 +
1824  drivers/bcma/host_pci.c                            |   52 +++
1825  drivers/bcma/main.c                                |    9 +
1826  drivers/bcma/sprom.c                               |  162 +++++++
1827  drivers/net/wireless/ath/ath.h                     |    1 +
1828  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |    6 -
1829  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |    8 -
1830  drivers/net/wireless/ath/ath9k/ar9003_paprd.c      |    7 +-
1831  drivers/net/wireless/ath/ath9k/ath9k.h             |    8 +-
1832  drivers/net/wireless/ath/ath9k/beacon.c            |   21 +-
1833  drivers/net/wireless/ath/ath9k/debug.c             |   59 +++-
1834  drivers/net/wireless/ath/ath9k/debug.h             |    1 +
1835  drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |    8 +-
1836  drivers/net/wireless/ath/ath9k/hw-ops.h            |    5 -
1837  drivers/net/wireless/ath/ath9k/hw.c                |    6 +-
1838  drivers/net/wireless/ath/ath9k/hw.h                |    2 -
1839  drivers/net/wireless/ath/ath9k/init.c              |    2 +-
1840  drivers/net/wireless/ath/ath9k/main.c              |  150 ++++---
1841  drivers/net/wireless/ath/ath9k/xmit.c              |  338 ++++++---------
1842  drivers/net/wireless/b43/Kconfig                   |    5 +
1843  drivers/net/wireless/b43/Makefile                  |    1 +
1844  drivers/net/wireless/b43/b43.h                     |   51 ++-
1845  drivers/net/wireless/b43/bus.c                     |  122 +++++
1846  drivers/net/wireless/b43/bus.h                     |   62 +++
1847  drivers/net/wireless/b43/dma.c                     |   38 +-
1848  drivers/net/wireless/b43/leds.c                    |   15 +-
1849  drivers/net/wireless/b43/lo.c                      |    6 +-
1850  drivers/net/wireless/b43/main.c                    |  234 ++++++----
1851  drivers/net/wireless/b43/main.h                    |    2 +-
1852  drivers/net/wireless/b43/phy_a.c                   |   21 +-
1853  drivers/net/wireless/b43/phy_common.c              |    8 +-
1854  drivers/net/wireless/b43/phy_g.c                   |   92 ++--
1855  drivers/net/wireless/b43/phy_lp.c                  |  135 +++---
1856  drivers/net/wireless/b43/phy_n.c                   |   37 +-
1857  drivers/net/wireless/b43/pio.c                     |   10 +-
1858  drivers/net/wireless/b43/rfkill.c                  |    9 +-
1859  drivers/net/wireless/b43/sdio.c                    |    4 +-
1860  drivers/net/wireless/b43/sysfs.c                   |    4 +-
1861  drivers/net/wireless/b43/tables_lpphy.c            |   15 +-
1862  drivers/net/wireless/b43/wa.c                      |   24 +-
1863  drivers/net/wireless/b43/xmit.c                    |    2 +-
1864  drivers/net/wireless/b43legacy/dma.c               |   10 +-
1865  drivers/net/wireless/b43legacy/main.c              |    8 +-
1866  drivers/net/wireless/b43legacy/xmit.c              |    2 -
1867  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    3 +
1868  drivers/net/wireless/iwlegacy/iwl-4965.c           |    6 +-
1869  drivers/net/wireless/iwlegacy/iwl-eeprom.c         |    1 -
1870  drivers/net/wireless/iwlwifi/iwl-1000.c            |    2 +-
1871  drivers/net/wireless/iwlwifi/iwl-2000.c            |    1 -
1872  drivers/net/wireless/iwlwifi/iwl-5000.c            |    2 -
1873  drivers/net/wireless/iwlwifi/iwl-6000.c            |    2 -
1874  drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c        |    3 -
1875  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |    7 +-
1876  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    2 +-
1877  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   74 +++-
1878  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   10 +-
1879  drivers/net/wireless/iwlwifi/iwl-agn.c             |  101 ++++-
1880  drivers/net/wireless/iwlwifi/iwl-core.c            |    7 +-
1881  drivers/net/wireless/iwlwifi/iwl-core.h            |   14 +-
1882  drivers/net/wireless/iwlwifi/iwl-scan.c            |   10 +-
1883  drivers/net/wireless/iwlwifi/iwl-tx.c              |    6 +-
1884  drivers/net/wireless/mac80211_hwsim.c              |  462 +++++++++++++++++++-
1885  drivers/net/wireless/mac80211_hwsim.h              |  133 ++++++
1886  drivers/net/wireless/mwifiex/main.c                |   18 +-
1887  drivers/net/wireless/mwifiex/main.h                |   11 +-
1888  drivers/net/wireless/mwifiex/sdio.c                |    8 +-
1889  drivers/net/wireless/mwifiex/sdio.h                |    2 +
1890  drivers/net/wireless/rt2x00/Kconfig                |    9 +-
1891  drivers/net/wireless/rt2x00/rt2800.h               |   16 +
1892  drivers/net/wireless/rt2x00/rt2800lib.c            |  376 ++++++++++++----
1893  drivers/net/wireless/rt2x00/rt2800lib.h            |    1 -
1894  drivers/net/wireless/rt2x00/rt2800pci.c            |    4 +-
1895  drivers/net/wireless/rt2x00/rt2800usb.c            |   83 ++++-
1896  drivers/net/wireless/rt2x00/rt2x00queue.c          |    5 +-
1897  drivers/net/wireless/rtlwifi/base.c                |    4 -
1898  drivers/net/wireless/rtlwifi/efuse.c               |    6 +-
1899  drivers/net/wireless/rtlwifi/pci.c                 |   41 +-
1900  drivers/net/wireless/rtlwifi/ps.c                  |   48 +--
1901  drivers/net/wireless/rtlwifi/regd.c                |   18 -
1902  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |    2 -
1903  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |   12 +-
1904  drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |    9 +-
1905  drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |   14 +-
1906  drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |    4 +-
1907  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |    2 -
1908  drivers/net/wireless/rtlwifi/rtl8192cu/phy.c       |    2 -
1909  drivers/net/wireless/rtlwifi/rtl8192se/dm.c        |    5 -
1910  drivers/net/wireless/rtlwifi/rtl8192se/fw.c        |    2 -
1911  drivers/net/wireless/rtlwifi/rtl8192se/hw.c        |   12 +-
1912  drivers/net/wireless/rtlwifi/rtl8192se/phy.c       |   18 +-
1913  drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |    6 +-
1914  drivers/net/wireless/rtlwifi/wifi.h                |    2 +-
1915  include/linux/bcma/bcma.h                          |   25 +
1916  include/linux/bcma/bcma_driver_chipcommon.h        |    1 +
1917  include/linux/cordic.h                             |   48 ++
1918  include/linux/crc8.h                               |  101 +++++
1919  include/net/cfg80211.h                             |   11 +
1920  include/net/mac80211.h                             |    4 +
1921  lib/Kconfig                                        |   14 +
1922  lib/Makefile                                       |    3 +
1923  lib/cordic.c                                       |  101 +++++
1924  lib/crc8.c                                         |   86 ++++
1925  net/mac80211/cfg.c                                 |   14 +
1926  net/mac80211/rc80211_minstrel.c                    |    9 +
1927  net/mac80211/rc80211_minstrel.h                    |   12 +
1928  net/mac80211/rc80211_minstrel_ht.c                 |    7 +
1929  net/wireless/nl80211.c                             |  107 +++++-
1930  110 files changed, 2907 insertions(+), 1017 deletions(-)
1931  create mode 100644 drivers/bcma/sprom.c
1932  create mode 100644 drivers/net/wireless/b43/bus.c
1933  create mode 100644 drivers/net/wireless/b43/bus.h
1934  create mode 100644 drivers/net/wireless/mac80211_hwsim.h
1935  create mode 100644 include/linux/cordic.h
1936  create mode 100644 include/linux/crc8.h
1937  create mode 100644 lib/cordic.c
1938  create mode 100644 lib/crc8.c
1939 Merging bluetooth/master
1940 $ git merge bluetooth/master
1941 Auto-merging net/bluetooth/hci_core.c
1942 Auto-merging net/bluetooth/l2cap_core.c
1943 Merge made by recursive.
1944  drivers/bluetooth/btmrvl_debugfs.c |   12 ++
1945  include/net/bluetooth/bluetooth.h  |    8 +
1946  include/net/bluetooth/hci.h        |   25 +++
1947  include/net/bluetooth/hci_core.h   |   19 ++-
1948  include/net/bluetooth/l2cap.h      |   24 ++--
1949  net/bluetooth/cmtp/capi.c          |    3 +-
1950  net/bluetooth/hci_conn.c           |   29 +++-
1951  net/bluetooth/hci_core.c           |   82 ++++++++++-
1952  net/bluetooth/hci_event.c          |  155 +++++++++++++-----
1953  net/bluetooth/l2cap_core.c         |  304 ++++++++++++++++++++++++++++++------
1954  net/bluetooth/l2cap_sock.c         |  281 ++++++++--------------------------
1955  net/bluetooth/mgmt.c               |   61 +++++--
1956  net/bluetooth/rfcomm/sock.c        |    7 +-
1957  net/bluetooth/sco.c                |   13 ++-
1958  14 files changed, 661 insertions(+), 362 deletions(-)
1959 Merging mtd/master
1960 $ git merge mtd/master
1961 Already up-to-date.
1962 Merging crypto/master
1963 $ git merge crypto/master
1964 Merge made by recursive.
1965  arch/x86/crypto/ghash-clmulni-intel_glue.c |    2 +-
1966  crypto/testmgr.h                           |  293 +++++++++++++++++++++++++++-
1967  drivers/crypto/caam/caamalg.c              |    6 +-
1968  3 files changed, 295 insertions(+), 6 deletions(-)
1969 Merging sound/for-next
1970 $ git merge sound/for-next
1971 Merge made by recursive.
1972  sound/pci/hda/hda_codec.c       |  139 ++++++---
1973  sound/pci/hda/hda_codec.h       |   16 +-
1974  sound/pci/hda/hda_eld.c         |   46 ++--
1975  sound/pci/hda/hda_intel.c       |    5 +-
1976  sound/pci/hda/hda_local.h       |    8 +-
1977  sound/pci/hda/patch_analog.c    |    4 +-
1978  sound/pci/hda/patch_ca0110.c    |    3 +-
1979  sound/pci/hda/patch_cirrus.c    |    3 +-
1980  sound/pci/hda/patch_cmedia.c    |    4 +-
1981  sound/pci/hda/patch_conexant.c  |    1 +
1982  sound/pci/hda/patch_hdmi.c      |  704 +++++++++++++++++++++++----------------
1983  sound/pci/hda/patch_realtek.c   |    1 +
1984  sound/pci/hda/patch_sigmatel.c  |    4 +-
1985  sound/pci/hda/patch_via.c       |   13 +-
1986  sound/soc/atmel/atmel-pcm.c     |    2 +-
1987  sound/soc/atmel/atmel-pcm.h     |    2 +-
1988  sound/soc/atmel/atmel_ssc_dai.c |    4 +-
1989  sound/soc/codecs/cs4270.c       |    5 +-
1990  sound/soc/codecs/max98088.c     |    2 -
1991  sound/soc/codecs/max98095.c     |    2 -
1992  sound/soc/davinci/davinci-pcm.c |  148 +++++----
1993  sound/soc/sh/fsi.c              |  576 ++++++++++++++++----------------
1994  sound/soc/soc-cache.c           |  294 +++++++++++++----
1995  sound/soc/soc-core.c            |   19 +-
1996  sound/soc/tegra/tegra_wm8903.c  |    2 +-
1997  25 files changed, 1215 insertions(+), 792 deletions(-)
1998 Merging sound-asoc/for-next
1999 $ git merge sound-asoc/for-next
2000 Merge made by recursive.
2001  include/sound/soc-dapm.h         |    2 +-
2002  include/sound/soc.h              |   10 +-
2003  sound/soc/atmel/atmel_ssc_dai.c  |    5 +-
2004  sound/soc/atmel/sam9g20_wm8731.c |    1 +
2005  sound/soc/codecs/ad1836.c        |  265 ++++++++++++++++++++++++-------------
2006  sound/soc/codecs/ad1836.h        |   31 ++---
2007  sound/soc/codecs/ak4641.c        |    2 +-
2008  sound/soc/codecs/wm8915.c        |  159 ++++++++++++++++-------
2009  sound/soc/nuc900/nuc900-ac97.c   |    2 +-
2010  sound/soc/omap/ams-delta.c       |    3 +-
2011  sound/soc/samsung/speyside.c     |   60 +++++++--
2012  sound/soc/soc-cache.c            |    3 +
2013  sound/soc/soc-core.c             |    2 +-
2014  sound/soc/soc-dapm.c             |  122 ++++++++++--------
2015  14 files changed, 431 insertions(+), 236 deletions(-)
2016 $ git reset --hard HEAD^
2017 HEAD is now at 4d7d131 Merge remote-tracking branch 'sound/for-next'
2018 Merging refs/next/20110606/sound-asoc
2019 $ git merge refs/next/20110606/sound-asoc
2020 Merge made by recursive.
2021  sound/soc/codecs/ak4641.c      |    2 +-
2022  sound/soc/codecs/wm8915.c      |   52 ++++++++++++++++++++++++++++-----------
2023  sound/soc/nuc900/nuc900-ac97.c |    2 +-
2024  sound/soc/samsung/speyside.c   |    8 +++---
2025  4 files changed, 43 insertions(+), 21 deletions(-)
2026 Merging cpufreq/next
2027 $ git merge cpufreq/next
2028 Already up-to-date.
2029 Merging cpufreq-move/move-drivers
2030 $ git merge cpufreq-move/move-drivers
2031 Already up-to-date.
2032 Merging quilt/rr
2033 $ git merge quilt/rr
2034 Merge made by recursive.
2035  kernel/params.c |    4 ++--
2036  1 files changed, 2 insertions(+), 2 deletions(-)
2037 Merging input/next
2038 $ git merge input/next
2039 Already up-to-date.
2040 Merging input-mt/next
2041 $ git merge input-mt/next
2042 Already up-to-date.
2043 Merging lsm/for-next
2044 $ git merge lsm/for-next
2045 Already up-to-date.
2046 Merging block/for-next
2047 $ git merge block/for-next
2048 Already up-to-date.
2049 Merging quilt/device-mapper
2050 $ git merge quilt/device-mapper
2051 Already up-to-date.
2052 Merging embedded/master
2053 $ git merge embedded/master
2054 Already up-to-date.
2055 Merging firmware/master
2056 $ git merge firmware/master
2057 Already up-to-date.
2058 Merging pcmcia/master
2059 $ git merge pcmcia/master
2060 Already up-to-date.
2061 Merging battery/master
2062 $ git merge battery/master
2063 Already up-to-date.
2064 Merging leds/for-mm
2065 $ git merge leds/for-mm
2066 Resolved 'drivers/leds/Kconfig' using previous resolution.
2067 Auto-merging drivers/leds/Kconfig
2068 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
2069 Automatic merge failed; fix conflicts and then commit the result.
2070 $ git commit -v -a
2071 [master e7f4ee4] Merge remote-tracking branch 'leds/for-mm'
2072 $ git diff -M --stat --summary HEAD^..
2073 Merging backlight/for-mm
2074 $ git merge backlight/for-mm
2075 Already up-to-date.
2076 Merging mmc/mmc-next
2077 $ git merge mmc/mmc-next
2078 CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
2079 Removing drivers/mmc/host/sdhci-of.h
2080 Auto-merging drivers/pci/quirks.c
2081 Auto-merging include/linux/mmc/host.h
2082 Removing include/linux/mmc/sdhci-pltfm.h
2083 Auto-merging include/linux/pci_ids.h
2084 Automatic merge failed; fix conflicts and then commit the result.
2085 $ git rm -f drivers/mmc/host/sdhci-of-core.c
2086 drivers/mmc/host/sdhci-of-core.c: needs merge
2087 rm 'drivers/mmc/host/sdhci-of-core.c'
2088 $ git commit -v -a
2089 [master 6d6ef21] Merge remote-tracking branch 'mmc/mmc-next'
2090 $ git diff -M --stat --summary HEAD^..
2091  drivers/mmc/host/Kconfig           |   51 ++++----
2092  drivers/mmc/host/Makefile          |   18 +--
2093  drivers/mmc/host/of_mmc_spi.c      |    5 +
2094  drivers/mmc/host/sdhci-cns3xxx.c   |   44 ++++++-
2095  drivers/mmc/host/sdhci-dove.c      |   43 ++++++-
2096  drivers/mmc/host/sdhci-esdhc-imx.c |  131 ++++++++++++++-----
2097  drivers/mmc/host/sdhci-esdhc.h     |    3 +-
2098  drivers/mmc/host/sdhci-of-core.c   |  253 ------------------------------------
2099  drivers/mmc/host/sdhci-of-esdhc.c  |   93 +++++++++++---
2100  drivers/mmc/host/sdhci-of-hlwd.c   |   67 ++++++++--
2101  drivers/mmc/host/sdhci-of.h        |   42 ------
2102  drivers/mmc/host/sdhci-pltfm.c     |  216 +++++++++++++++----------------
2103  drivers/mmc/host/sdhci-pltfm.h     |   90 ++++++++++++-
2104  drivers/mmc/host/sdhci-tegra.c     |  117 ++++++++++++-----
2105  drivers/mmc/host/sdhci.c           |    9 +-
2106  drivers/mmc/host/sdhci.h           |    2 +
2107  drivers/mmc/host/sh_mobile_sdhi.c  |    3 +-
2108  drivers/mmc/host/vub300.c          |   11 +-
2109  drivers/pci/quirks.c               |    2 +
2110  include/linux/mmc/boot.h           |    6 +-
2111  include/linux/mmc/card.h           |    2 +-
2112  include/linux/mmc/core.h           |    2 +-
2113  include/linux/mmc/dw_mmc.h         |    6 +-
2114  include/linux/mmc/host.h           |    3 +-
2115  include/linux/mmc/ioctl.h          |    2 +-
2116  include/linux/mmc/mmc.h            |    7 +-
2117  include/linux/mmc/pm.h             |    2 +-
2118  include/linux/mmc/sd.h             |    7 +-
2119  include/linux/mmc/sdhci-pltfm.h    |   35 -----
2120  include/linux/mmc/sdhci-spear.h    |    6 +-
2121  include/linux/mmc/sdhci.h          |   14 +-
2122  include/linux/mmc/sdio.h           |    7 +-
2123  include/linux/mmc/sdio_func.h      |    7 +-
2124  include/linux/mmc/sdio_ids.h       |    6 +-
2125  include/linux/mmc/sh_mmcif.h       |    6 +-
2126  include/linux/mmc/sh_mobile_sdhi.h |    6 +-
2127  include/linux/mmc/tmio.h           |    6 +-
2128  include/linux/pci_ids.h            |    1 +
2129  38 files changed, 681 insertions(+), 650 deletions(-)
2130  delete mode 100644 drivers/mmc/host/sdhci-of-core.c
2131  delete mode 100644 drivers/mmc/host/sdhci-of.h
2132  delete mode 100644 include/linux/mmc/sdhci-pltfm.h
2133 Merging kgdb/kgdb-next
2134 $ git merge kgdb/kgdb-next
2135 Already up-to-date.
2136 Merging slab/for-next
2137 $ git merge slab/for-next
2138 Merge made by recursive.
2139  include/linux/percpu.h |    3 +++
2140  mm/slab.c              |    9 +++++----
2141  mm/slub.c              |   12 ++++--------
2142  3 files changed, 12 insertions(+), 12 deletions(-)
2143 Merging uclinux/for-next
2144 $ git merge uclinux/for-next
2145 Already up-to-date.
2146 Merging md/for-next
2147 $ git merge md/for-next
2148 Already up-to-date.
2149 Merging mfd/for-next
2150 $ git merge mfd/for-next
2151 Already up-to-date.
2152 Merging hdlc/hdlc-next
2153 $ git merge hdlc/hdlc-next
2154 Already up-to-date.
2155 Merging drm/drm-next
2156 $ git merge drm/drm-next
2157 Already up-to-date.
2158 Merging fbdev/master
2159 $ git merge fbdev/master
2160 Already up-to-date.
2161 Merging viafb/viafb-next
2162 $ git merge viafb/viafb-next
2163 Auto-merging drivers/video/via/viafbdev.c
2164 Merge made by recursive.
2165  drivers/video/via/viafbdev.c |    5 +++--
2166  1 files changed, 3 insertions(+), 2 deletions(-)
2167 Merging omap_dss2/for-next
2168 $ git merge omap_dss2/for-next
2169 Already up-to-date.
2170 Merging voltage/for-next
2171 $ git merge voltage/for-next
2172 Merge made by recursive.
2173  drivers/regulator/core.c             |   32 ++++++++++++++++++++++++++------
2174  drivers/regulator/twl-regulator.c    |    2 +-
2175  drivers/regulator/wm8994-regulator.c |    4 ++--
2176  include/linux/regulator/consumer.h   |    3 +++
2177  4 files changed, 32 insertions(+), 9 deletions(-)
2178 Merging security-testing/next
2179 $ git merge security-testing/next
2180 Already up-to-date.
2181 Merging selinux/master
2182 $ git merge selinux/master
2183 Already up-to-date.
2184 Merging lblnet/master
2185 $ git merge lblnet/master
2186 Already up-to-date.
2187 Merging agp/agp-next
2188 $ git merge agp/agp-next
2189 Merge made by recursive.
2190 Merging watchdog/master
2191 $ git merge watchdog/master
2192 Auto-merging drivers/watchdog/Kconfig
2193 Auto-merging drivers/watchdog/Makefile
2194 Merge made by recursive.
2195  drivers/watchdog/Kconfig              |   11 +-
2196  drivers/watchdog/Makefile             |    1 +
2197  drivers/watchdog/dw_wdt.c             |  376 ++++++++++++++++++++++++++++++
2198  drivers/watchdog/iTCO_wdt.c           |  407 +++++++++++----------------------
2199  drivers/watchdog/intel_scu_watchdog.c |    1 -
2200  drivers/watchdog/it8712f_wdt.c        |   61 ++++--
2201  drivers/watchdog/it87_wdt.c           |  168 ++++++++-------
2202  drivers/watchdog/pc87413_wdt.c        |   96 ++++----
2203  8 files changed, 710 insertions(+), 411 deletions(-)
2204  create mode 100644 drivers/watchdog/dw_wdt.c
2205 Merging bdev/master
2206 $ git merge bdev/master
2207 Already up-to-date.
2208 Merging dwmw2-iommu/master
2209 $ git merge dwmw2-iommu/master
2210 Already up-to-date.
2211 Merging cputime/cputime
2212 $ git merge cputime/cputime
2213 Already up-to-date.
2214 Merging osd/linux-next
2215 $ git merge osd/linux-next
2216 Already up-to-date.
2217 Merging jc_docs/docs-next
2218 $ git merge jc_docs/docs-next
2219 Already up-to-date.
2220 Merging nommu/master
2221 $ git merge nommu/master
2222 Already up-to-date.
2223 Merging trivial/for-next
2224 $ git merge trivial/for-next
2225 Merge made by recursive.
2226  include/linux/hw_random.h |    2 +-
2227  1 files changed, 1 insertions(+), 1 deletions(-)
2228 Merging audit/for-next
2229 $ git merge audit/for-next
2230 Already up-to-date.
2231 Merging suspend/linux-next
2232 $ git merge suspend/linux-next
2233 Already up-to-date.
2234 Merging apm/for-next
2235 $ git merge apm/for-next
2236 Already up-to-date.
2237 Merging fsnotify/for-next
2238 $ git merge fsnotify/for-next
2239 Auto-merging fs/cachefiles/namei.c
2240 Auto-merging fs/nfsd/vfs.c
2241 Auto-merging fs/notify/fanotify/fanotify_user.c
2242 Auto-merging fs/notify/mark.c
2243 Auto-merging include/linux/fsnotify_backend.h
2244 Merge made by recursive.
2245  fs/cachefiles/namei.c              |    1 -
2246  fs/cachefiles/xattr.c              |    1 -
2247  fs/nfsd/vfs.c                      |    3 -
2248  fs/notify/dnotify/dnotify.c        |   15 +++---
2249  fs/notify/fanotify/fanotify.c      |   24 +++++----
2250  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
2251  fs/notify/group.c                  |    1 +
2252  fs/notify/mark.c                   |   36 +++++--------
2253  include/linux/fanotify.h           |    5 ++-
2254  include/linux/fsnotify_backend.h   |   14 ++++-
2255  10 files changed, 121 insertions(+), 80 deletions(-)
2256 Merging irda/for-next
2257 $ git merge irda/for-next
2258 Already up-to-date.
2259 Merging i7core_edac/linux_next
2260 $ git merge i7core_edac/linux_next
2261 Auto-merging drivers/edac/i7core_edac.c
2262 Merge made by recursive.
2263  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
2264  1 files changed, 20 insertions(+), 3 deletions(-)
2265 Merging i7300_edac/linux_next
2266 $ git merge i7300_edac/linux_next
2267 Already up-to-date!
2268 Merge made by recursive.
2269 Merging devicetree/devicetree/next
2270 $ git merge devicetree/devicetree/next
2271 Merge made by recursive.
2272  arch/powerpc/platforms/52xx/mpc52xx_common.c |   10 ++---
2273  drivers/of/platform.c                        |   54 ++++++++++++++++++++++++--
2274  include/linux/of_platform.h                  |    3 +
2275  3 files changed, 57 insertions(+), 10 deletions(-)
2276 Merging spi/spi/next
2277 $ git merge spi/spi/next
2278 Removing drivers/spi/atmel_spi.h
2279 Auto-merging drivers/spi/spi-atmel.c
2280 Auto-merging drivers/spi/spi-au1550.c
2281 Auto-merging drivers/spi/spi-bitbang.c
2282 Auto-merging drivers/spi/spi-butterfly.c
2283 Auto-merging drivers/spi/spi-dw-mid.c
2284 Auto-merging drivers/spi/spi-dw-mmio.c
2285 Auto-merging drivers/spi/spi-dw-pci.c
2286 Auto-merging drivers/spi/spi-dw.c
2287 Auto-merging drivers/spi/spi-fsl-espi.c
2288 Auto-merging drivers/spi/spi-fsl-lib.c
2289 Auto-merging drivers/spi/spi-fsl-spi.c
2290 Auto-merging drivers/spi/spi-gpio.c
2291 Auto-merging drivers/spi/spi-lm70llp.c
2292 Auto-merging drivers/spi/spi-nuc900.c
2293 Auto-merging drivers/spi/spi-omap-uwire.c
2294 Auto-merging drivers/spi/spi-orion.c
2295 Auto-merging drivers/spi/spi-pl022.c
2296 Auto-merging drivers/spi/spi-s3c24xx-fiq.S
2297 Auto-merging drivers/spi/spi-s3c24xx-gpio.c
2298 Auto-merging drivers/spi/spi-s3c24xx.c
2299 Auto-merging drivers/spi/spi-s3c64xx.c
2300 Auto-merging drivers/spi/spi-sh-sci.c
2301 Auto-merging drivers/spi/spi-tle62x0.c
2302 Auto-merging drivers/spi/spi-txx9.c
2303 Merge made by recursive.
2304  drivers/spi/Kconfig                                |   18 --
2305  drivers/spi/Makefile                               |  112 ++++++-------
2306  drivers/spi/atmel_spi.h                            |  167 --------------------
2307  drivers/spi/{spi_altera.c => spi-altera.c}         |    0
2308  drivers/spi/{ath79_spi.c => spi-ath79.c}           |    0
2309  drivers/spi/{atmel_spi.c => spi-atmel.c}           |  155 ++++++++++++++++++-
2310  drivers/spi/{au1550_spi.c => spi-au1550.c}         |    2 +-
2311  drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} |    0
2312  drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c}       |    0
2313  .../spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} |    0
2314  drivers/spi/{spi_bitbang.c => spi-bitbang.c}       |    8 +-
2315  drivers/spi/{spi_butterfly.c => spi-butterfly.c}   |    4 +-
2316  .../spi/{coldfire_qspi.c => spi-coldfire-qspi.c}   |    0
2317  drivers/spi/{davinci_spi.c => spi-davinci.c}       |    0
2318  drivers/spi/{dw_spi_mid.c => spi-dw-mid.c}         |    4 +-
2319  drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c}       |    4 +-
2320  drivers/spi/{dw_spi_pci.c => spi-dw-pci.c}         |    4 +-
2321  drivers/spi/{dw_spi.c => spi-dw.c}                 |    4 +-
2322  drivers/spi/{dw_spi.h => spi-dw.h}                 |    0
2323  drivers/spi/{ep93xx_spi.c => spi-ep93xx.c}         |    0
2324  drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c}     |    2 +-
2325  drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c}       |    2 +-
2326  drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h}       |    0
2327  drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c}       |    2 +-
2328  drivers/spi/{spi_gpio.c => spi-gpio.c}             |    6 +-
2329  drivers/spi/{spi_imx.c => spi-imx.c}               |    0
2330  drivers/spi/{spi_lm70llp.c => spi-lm70llp.c}       |    4 +-
2331  .../spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c}   |    0
2332  .../spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c}   |    0
2333  drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c}       |    0
2334  drivers/spi/{spi_nuc900.c => spi-nuc900.c}         |    5 +-
2335  drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c}       |    0
2336  drivers/spi/{omap_spi_100k.c => spi-omap-100k.c}   |    0
2337  drivers/spi/{omap_uwire.c => spi-omap-uwire.c}     |    2 +-
2338  drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c}   |    0
2339  drivers/spi/{orion_spi.c => spi-orion.c}           |    2 +-
2340  drivers/spi/{amba-pl022.c => spi-pl022.c}          |    2 -
2341  drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c}         |    0
2342  drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} |    0
2343  drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c}         |    0
2344  .../spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S}   |    2 +-
2345  .../spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h}   |    0
2346  .../spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} |    5 +-
2347  drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c}       |    5 +-
2348  drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c}       |    3 +-
2349  drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c}     |    0
2350  drivers/spi/{spi_sh_sci.c => spi-sh-sci.c}         |    2 +-
2351  drivers/spi/{spi_sh.c => spi-sh.c}                 |    0
2352  drivers/spi/{spi_stmp.c => spi-stmp.c}             |    0
2353  drivers/spi/{spi_tegra.c => spi-tegra.c}           |    0
2354  drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c}         |    0
2355  drivers/spi/{tle62x0.c => spi-tle62x0.c}           |    2 +-
2356  .../spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} |    0
2357  drivers/spi/{spi_txx9.c => spi-txx9.c}             |    2 +-
2358  drivers/spi/{xilinx_spi.c => spi-xilinx.c}         |    0
2359  drivers/spi/spi.c                                  |    2 +-
2360  drivers/spi/spidev.c                               |    2 +-
2361  57 files changed, 242 insertions(+), 292 deletions(-)
2362  delete mode 100644 drivers/spi/atmel_spi.h
2363  rename drivers/spi/{spi_altera.c => spi-altera.c} (100%)
2364  rename drivers/spi/{ath79_spi.c => spi-ath79.c} (100%)
2365  rename drivers/spi/{atmel_spi.c => spi-atmel.c} (85%)
2366  rename drivers/spi/{au1550_spi.c => spi-au1550.c} (99%)
2367  rename drivers/spi/{spi_bfin_sport.c => spi-bfin-sport.c} (100%)
2368  rename drivers/spi/{spi_bfin5xx.c => spi-bfin5xx.c} (100%)
2369  rename drivers/spi/{spi_bitbang_txrx.h => spi-bitbang-txrx.h} (100%)
2370  rename drivers/spi/{spi_bitbang.c => spi-bitbang.c} (98%)
2371  rename drivers/spi/{spi_butterfly.c => spi-butterfly.c} (99%)
2372  rename drivers/spi/{coldfire_qspi.c => spi-coldfire-qspi.c} (100%)
2373  rename drivers/spi/{davinci_spi.c => spi-davinci.c} (100%)
2374  rename drivers/spi/{dw_spi_mid.c => spi-dw-mid.c} (98%)
2375  rename drivers/spi/{dw_spi_mmio.c => spi-dw-mmio.c} (97%)
2376  rename drivers/spi/{dw_spi_pci.c => spi-dw-pci.c} (98%)
2377  rename drivers/spi/{dw_spi.c => spi-dw.c} (99%)
2378  rename drivers/spi/{dw_spi.h => spi-dw.h} (100%)
2379  rename drivers/spi/{ep93xx_spi.c => spi-ep93xx.c} (100%)
2380  rename drivers/spi/{spi_fsl_espi.c => spi-fsl-espi.c} (99%)
2381  rename drivers/spi/{spi_fsl_lib.c => spi-fsl-lib.c} (99%)
2382  rename drivers/spi/{spi_fsl_lib.h => spi-fsl-lib.h} (100%)
2383  rename drivers/spi/{spi_fsl_spi.c => spi-fsl-spi.c} (99%)
2384  rename drivers/spi/{spi_gpio.c => spi-gpio.c} (99%)
2385  rename drivers/spi/{spi_imx.c => spi-imx.c} (100%)
2386  rename drivers/spi/{spi_lm70llp.c => spi-lm70llp.c} (98%)
2387  rename drivers/spi/{mpc512x_psc_spi.c => spi-mpc512x-psc.c} (100%)
2388  rename drivers/spi/{mpc52xx_psc_spi.c => spi-mpc52xx-psc.c} (100%)
2389  rename drivers/spi/{mpc52xx_spi.c => spi-mpc52xx.c} (100%)
2390  rename drivers/spi/{spi_nuc900.c => spi-nuc900.c} (99%)
2391  rename drivers/spi/{spi_oc_tiny.c => spi-oc-tiny.c} (100%)
2392  rename drivers/spi/{omap_spi_100k.c => spi-omap-100k.c} (100%)
2393  rename drivers/spi/{omap_uwire.c => spi-omap-uwire.c} (99%)
2394  rename drivers/spi/{omap2_mcspi.c => spi-omap2-mcspi.c} (100%)
2395  rename drivers/spi/{orion_spi.c => spi-orion.c} (99%)
2396  rename drivers/spi/{amba-pl022.c => spi-pl022.c} (99%)
2397  rename drivers/spi/{spi_ppc4xx.c => spi-ppc4xx.c} (100%)
2398  rename drivers/spi/{pxa2xx_spi_pci.c => spi-pxa2xx-pci.c} (100%)
2399  rename drivers/spi/{pxa2xx_spi.c => spi-pxa2xx.c} (100%)
2400  rename drivers/spi/{spi_s3c24xx_fiq.S => spi-s3c24xx-fiq.S} (99%)
2401  rename drivers/spi/{spi_s3c24xx_fiq.h => spi-s3c24xx-fiq.h} (100%)
2402  rename drivers/spi/{spi_s3c24xx_gpio.c => spi-s3c24xx-gpio.c} (98%)
2403  rename drivers/spi/{spi_s3c24xx.c => spi-s3c24xx.c} (99%)
2404  rename drivers/spi/{spi_s3c64xx.c => spi-s3c64xx.c} (99%)
2405  rename drivers/spi/{spi_sh_msiof.c => spi-sh-msiof.c} (100%)
2406  rename drivers/spi/{spi_sh_sci.c => spi-sh-sci.c} (99%)
2407  rename drivers/spi/{spi_sh.c => spi-sh.c} (100%)
2408  rename drivers/spi/{spi_stmp.c => spi-stmp.c} (100%)
2409  rename drivers/spi/{spi_tegra.c => spi-tegra.c} (100%)
2410  rename drivers/spi/{ti-ssp-spi.c => spi-ti-ssp.c} (100%)
2411  rename drivers/spi/{tle62x0.c => spi-tle62x0.c} (99%)
2412  rename drivers/spi/{spi_topcliff_pch.c => spi-topcliff-pch.c} (100%)
2413  rename drivers/spi/{spi_txx9.c => spi-txx9.c} (99%)
2414  rename drivers/spi/{xilinx_spi.c => spi-xilinx.c} (100%)
2415 $ git reset --hard HEAD^
2416 HEAD is now at bef6a00 Merge remote-tracking branch 'devicetree/devicetree/next'
2417 Merging refs/next/20110606/spi
2418 $ git merge refs/next/20110606/spi
2419 Merge made by recursive.
2420  drivers/spi/spi_bitbang.c |    6 +++---
2421  1 files changed, 3 insertions(+), 3 deletions(-)
2422 Merging gpio/gpio/next
2423 $ git merge gpio/gpio/next
2424 Recorded preimage for 'arch/arm/mach-ep93xx/Makefile'
2425 Auto-merging arch/arm/mach-ep93xx/Makefile
2426 CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
2427 Auto-merging arch/arm/mach-imx/mach-apf9328.c
2428 Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
2429 Auto-merging arch/arm/mach-imx/mach-mx27_3ds.c
2430 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
2431 Auto-merging arch/arm/mach-imx/mach-mx35_3ds.c
2432 Auto-merging arch/arm/mach-mx5/board-cpuimx51.c
2433 Auto-merging arch/arm/mach-mx5/board-mx51_3ds.c
2434 Auto-merging arch/arm/mach-mx5/board-mx51_babbage.c
2435 Auto-merging arch/arm/mach-mx5/board-mx51_efikamx.c
2436 Auto-merging arch/arm/mach-mx5/board-mx51_efikasb.c
2437 Auto-merging arch/arm/mach-mx5/board-mx53_evk.c
2438 Auto-merging arch/arm/mach-mx5/board-mx53_loco.c
2439 Removing arch/arm/mach-mxs/gpio.h
2440 Auto-merging arch/arm/mach-mxs/mach-mx28evk.c
2441 Auto-merging drivers/gpio/gpio-74x164.c
2442 Auto-merging drivers/gpio/gpio-ep93xx.c
2443 Auto-merging drivers/gpio/gpio-generic.c
2444 Auto-merging drivers/gpio/gpio-it8761e.c
2445 Auto-merging drivers/gpio/gpio-langwell.c
2446 Auto-merging drivers/gpio/gpio-max7300.c
2447 Auto-merging drivers/gpio/gpio-max7301.c
2448 Auto-merging drivers/gpio/gpio-max730x.c
2449 Auto-merging drivers/gpio/gpio-max732x.c
2450 Auto-merging drivers/gpio/gpio-mc33880.c
2451 Auto-merging drivers/gpio/gpio-mcp23s08.c
2452 Auto-merging drivers/gpio/gpio-mxc.c
2453 Auto-merging drivers/gpio/gpio-mxs.c
2454 Auto-merging drivers/gpio/gpio-pca953x.c
2455 Auto-merging drivers/gpio/gpio-pcf857x.c
2456 Auto-merging drivers/gpio/gpio-pl061.c
2457 Auto-merging drivers/gpio/gpio-sch.c
2458 Auto-merging drivers/gpio/gpio-timberdale.c
2459 Auto-merging drivers/gpio/gpio-tps65910.c
2460 Auto-merging drivers/gpio/gpio-twl4030.c
2461 Auto-merging drivers/gpio/gpio-wm831x.c
2462 Auto-merging drivers/gpio/gpio-wm8350.c
2463 Auto-merging drivers/gpio/gpio-wm8994.c
2464 Automatic merge failed; fix conflicts and then commit the result.
2465 $ git commit -v -a
2466 Recorded resolution for 'arch/arm/mach-ep93xx/Makefile'.
2467 [master f9dac69] Merge remote-tracking branch 'gpio/gpio/next'
2468 $ git diff -M --stat --summary HEAD^..
2469  arch/arm/mach-ep93xx/Makefile                      |    2 +-
2470  arch/arm/mach-imx/mach-apf9328.c                   |    2 +
2471  arch/arm/mach-imx/mach-armadillo5x0.c              |    2 +
2472  arch/arm/mach-imx/mach-bug.c                       |    2 +
2473  arch/arm/mach-imx/mach-cpuimx27.c                  |    2 +
2474  arch/arm/mach-imx/mach-cpuimx35.c                  |    2 +
2475  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    2 +
2476  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    2 +
2477  arch/arm/mach-imx/mach-imx27ipcam.c                |    2 +
2478  arch/arm/mach-imx/mach-imx27lite.c                 |    2 +
2479  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    2 +
2480  arch/arm/mach-imx/mach-mx1ads.c                    |    2 +
2481  arch/arm/mach-imx/mach-mx21ads.c                   |    2 +
2482  arch/arm/mach-imx/mach-mx25_3ds.c                  |    2 +
2483  arch/arm/mach-imx/mach-mx27_3ds.c                  |    2 +
2484  arch/arm/mach-imx/mach-mx27ads.c                   |    2 +
2485  arch/arm/mach-imx/mach-mx31_3ds.c                  |    2 +
2486  arch/arm/mach-imx/mach-mx31ads.c                   |    2 +
2487  arch/arm/mach-imx/mach-mx31lilly.c                 |    2 +
2488  arch/arm/mach-imx/mach-mx31lite.c                  |    2 +
2489  arch/arm/mach-imx/mach-mx31moboard.c               |    2 +
2490  arch/arm/mach-imx/mach-mx35_3ds.c                  |    2 +
2491  arch/arm/mach-imx/mach-mxt_td60.c                  |    2 +
2492  arch/arm/mach-imx/mach-pca100.c                    |    2 +
2493  arch/arm/mach-imx/mach-pcm037.c                    |    2 +
2494  arch/arm/mach-imx/mach-pcm038.c                    |    2 +
2495  arch/arm/mach-imx/mach-pcm043.c                    |    2 +
2496  arch/arm/mach-imx/mach-qong.c                      |    2 +
2497  arch/arm/mach-imx/mach-scb9328.c                   |    2 +
2498  arch/arm/mach-imx/mach-vpr200.c                    |    2 +
2499  arch/arm/mach-imx/mm-imx1.c                        |   17 +-
2500  arch/arm/mach-imx/mm-imx21.c                       |   21 +-
2501  arch/arm/mach-imx/mm-imx25.c                       |   16 +-
2502  arch/arm/mach-imx/mm-imx27.c                       |   21 +-
2503  arch/arm/mach-imx/mm-imx31.c                       |   15 +-
2504  arch/arm/mach-imx/mm-imx35.c                       |   15 +-
2505  arch/arm/mach-mx5/board-cpuimx51.c                 |    2 +
2506  arch/arm/mach-mx5/board-cpuimx51sd.c               |    2 +
2507  arch/arm/mach-mx5/board-mx50_rdp.c                 |    2 +
2508  arch/arm/mach-mx5/board-mx51_3ds.c                 |    2 +
2509  arch/arm/mach-mx5/board-mx51_babbage.c             |    2 +
2510  arch/arm/mach-mx5/board-mx51_efikamx.c             |    2 +
2511  arch/arm/mach-mx5/board-mx51_efikasb.c             |    2 +
2512  arch/arm/mach-mx5/board-mx53_evk.c                 |    2 +
2513  arch/arm/mach-mx5/board-mx53_loco.c                |    2 +
2514  arch/arm/mach-mx5/board-mx53_smd.c                 |    2 +
2515  arch/arm/mach-mx5/devices.c                        |   64 -----
2516  arch/arm/mach-mx5/mm-mx50.c                        |   21 +-
2517  arch/arm/mach-mx5/mm.c                             |   25 ++-
2518  arch/arm/mach-mxs/Makefile                         |    2 +-
2519  arch/arm/mach-mxs/devices.c                        |   11 +
2520  arch/arm/mach-mxs/devices/Makefile                 |    1 +
2521  arch/arm/mach-mxs/devices/platform-gpio-mxs.c      |   53 ++++
2522  arch/arm/mach-mxs/gpio.h                           |   34 ---
2523  arch/arm/mach-mxs/include/mach/devices-common.h    |    2 +
2524  arch/arm/mach-mxs/mach-mx28evk.c                   |    1 -
2525  arch/arm/mach-mxs/mm-mx23.c                        |    1 -
2526  arch/arm/mach-mxs/mm-mx28.c                        |    1 -
2527  arch/arm/plat-mxc/Makefile                         |    2 +-
2528  arch/arm/plat-mxc/devices.c                        |   11 +
2529  arch/arm/plat-mxc/devices/Makefile                 |    1 +
2530  arch/arm/plat-mxc/devices/platform-gpio-mxc.c      |   32 +++
2531  arch/arm/plat-mxc/include/mach/common.h            |   12 +-
2532  arch/arm/plat-mxc/include/mach/devices-common.h    |    2 +
2533  arch/arm/plat-mxc/include/mach/gpio.h              |   27 --
2534  drivers/gpio/Kconfig                               |   73 +++----
2535  drivers/gpio/Makefile                              |   84 ++++---
2536  drivers/gpio/{74x164.c => gpio-74x164.c}           |   27 +--
2537  drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c}      |    0
2538  drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c}    |    0
2539  drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c}    |    0
2540  drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c}         |    0
2541  drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c}      |    0
2542  .../gpio.c => drivers/gpio/gpio-ep93xx.c           |    2 -
2543  drivers/gpio/gpio-exynos4.c                        |    5 +-
2544  drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} |    6 +-
2545  drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c}    |    2 +-
2546  drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c}       |    0
2547  drivers/gpio/{langwell_gpio.c => gpio-langwell.c}  |    4 +-
2548  drivers/gpio/{max7300.c => gpio-max7300.c}         |    2 -
2549  drivers/gpio/{max7301.c => gpio-max7301.c}         |    2 -
2550  drivers/gpio/{max730x.c => gpio-max730x.c}         |    2 -
2551  drivers/gpio/{max732x.c => gpio-max732x.c}         |    2 +-
2552  drivers/gpio/{mc33880.c => gpio-mc33880.c}         |    2 +-
2553  drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c}       |    2 +-
2554  drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c}      |    0
2555  .../arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c |  266 +++++++++++---------
2556  .../arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c |  227 ++++++++++-------
2557  drivers/gpio/{pca953x.c => gpio-pca953x.c}         |    3 +-
2558  drivers/gpio/{pcf857x.c => gpio-pcf857x.c}         |    2 +-
2559  drivers/gpio/{pch_gpio.c => gpio-pch.c}            |    0
2560  drivers/gpio/{pl061.c => gpio-pl061.c}             |    4 +-
2561  drivers/gpio/gpio-plat-samsung.c                   |    3 +-
2562  drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c}    |    0
2563  drivers/gpio/gpio-s5pc100.c                        |    5 +-
2564  drivers/gpio/gpio-s5pv210.c                        |    5 +-
2565  drivers/gpio/{sch_gpio.c => gpio-sch.c}            |    2 +-
2566  drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c}        |    0
2567  drivers/gpio/{sx150x.c => gpio-sx150x.c}           |    0
2568  drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c}    |    0
2569  drivers/gpio/{timbgpio.c => gpio-timberdale.c}     |    2 +-
2570  drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c}  |    2 +-
2571  drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c}    |    2 +-
2572  drivers/gpio/gpio-u300.c                           |    5 +-
2573  drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c}    |    0
2574  drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c}       |    0
2575  drivers/gpio/{vx855_gpio.c => gpio-vx855.c}        |    0
2576  drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c}      |    2 +-
2577  drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c}   |    2 +-
2578  drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c}      |    2 +-
2579  drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c}      |    0
2580  drivers/leds/Kconfig                               |   19 +--
2581  drivers/leds/leds-gpio.c                           |    6 +-
2582  include/linux/spi/74x164.h                         |    2 -
2583  114 files changed, 675 insertions(+), 589 deletions(-)
2584  create mode 100644 arch/arm/mach-mxs/devices/platform-gpio-mxs.c
2585  delete mode 100644 arch/arm/mach-mxs/gpio.h
2586  create mode 100644 arch/arm/plat-mxc/devices/platform-gpio-mxc.c
2587  rename drivers/gpio/{74x164.c => gpio-74x164.c} (92%)
2588  rename drivers/gpio/{ab8500-gpio.c => gpio-ab8500.c} (100%)
2589  rename drivers/gpio/{adp5520-gpio.c => gpio-adp5520.c} (100%)
2590  rename drivers/gpio/{adp5588-gpio.c => gpio-adp5588.c} (100%)
2591  rename drivers/gpio/{bt8xxgpio.c => gpio-bt8xx.c} (100%)
2592  rename drivers/gpio/{cs5535-gpio.c => gpio-cs5535.c} (100%)
2593  rename arch/arm/mach-ep93xx/gpio.c => drivers/gpio/gpio-ep93xx.c (99%)
2594  rename drivers/gpio/{basic_mmio_gpio.c => gpio-generic.c} (99%)
2595  rename drivers/gpio/{it8761e_gpio.c => gpio-it8761e.c} (98%)
2596  rename drivers/gpio/{janz-ttl.c => gpio-janz-ttl.c} (100%)
2597  rename drivers/gpio/{langwell_gpio.c => gpio-langwell.c} (99%)
2598  rename drivers/gpio/{max7300.c => gpio-max7300.c} (98%)
2599  rename drivers/gpio/{max7301.c => gpio-max7301.c} (98%)
2600  rename drivers/gpio/{max730x.c => gpio-max730x.c} (99%)
2601  rename drivers/gpio/{max732x.c => gpio-max732x.c} (99%)
2602  rename drivers/gpio/{mc33880.c => gpio-mc33880.c} (98%)
2603  rename drivers/gpio/{mcp23s08.c => gpio-mcp23s08.c} (99%)
2604  rename drivers/gpio/{ml_ioh_gpio.c => gpio-ml-ioh.c} (100%)
2605  rename arch/arm/plat-mxc/gpio.c => drivers/gpio/gpio-mxc.c (60%)
2606  rename arch/arm/mach-mxs/gpio.c => drivers/gpio/gpio-mxs.c (58%)
2607  rename drivers/gpio/{pca953x.c => gpio-pca953x.c} (99%)
2608  rename drivers/gpio/{pcf857x.c => gpio-pcf857x.c} (99%)
2609  rename drivers/gpio/{pch_gpio.c => gpio-pch.c} (100%)
2610  rename drivers/gpio/{pl061.c => gpio-pl061.c} (99%)
2611  rename drivers/gpio/{rdc321x-gpio.c => gpio-rdc321x.c} (100%)
2612  rename drivers/gpio/{sch_gpio.c => gpio-sch.c} (99%)
2613  rename drivers/gpio/{stmpe-gpio.c => gpio-stmpe.c} (100%)
2614  rename drivers/gpio/{sx150x.c => gpio-sx150x.c} (100%)
2615  rename drivers/gpio/{tc3589x-gpio.c => gpio-tc3589x.c} (100%)
2616  rename drivers/gpio/{timbgpio.c => gpio-timberdale.c} (99%)
2617  rename drivers/gpio/{tps65910-gpio.c => gpio-tps65910.c} (98%)
2618  rename drivers/gpio/{twl4030-gpio.c => gpio-twl4030.c} (99%)
2619  rename drivers/gpio/{ucb1400_gpio.c => gpio-ucb1400.c} (100%)
2620  rename drivers/gpio/{vr41xx_giu.c => gpio-vr41xx.c} (100%)
2621  rename drivers/gpio/{vx855_gpio.c => gpio-vx855.c} (100%)
2622  rename drivers/gpio/{wm831x-gpio.c => gpio-wm831x.c} (99%)
2623  rename drivers/gpio/{wm8350-gpiolib.c => gpio-wm8350.c} (98%)
2624  rename drivers/gpio/{wm8994-gpio.c => gpio-wm8994.c} (99%)
2625  rename drivers/gpio/{xilinx_gpio.c => gpio-xilinx.c} (100%)
2626 Merging tip/auto-latest
2627 $ git merge tip/auto-latest
2628 Merge made by recursive.
2629  arch/x86/boot/Makefile                   |    9 +-
2630  arch/x86/boot/tools/build.c              |   33 +-
2631  arch/x86/ia32/ia32entry.S                |   10 +-
2632  arch/x86/include/asm/calling.h           |  130 +-
2633  arch/x86/include/asm/segment.h           |    2 +-
2634  arch/x86/include/asm/uv/uv_mmrs.h        | 2889 +++++++++++++++++-------------
2635  arch/x86/kernel/entry_64.S               |    6 +-
2636  arch/x86/lib/thunk_64.S                  |   46 +-
2637  arch/x86/mm/pageattr-test.c              |    3 +-
2638  arch/x86/pci/mmconfig-shared.c           |    3 +-
2639  include/linux/irqreturn.h                |    6 +-
2640  include/linux/perf_event.h               |    8 +-
2641  include/linux/sched.h                    |    1 +
2642  kernel/events/core.c                     |  236 ++--
2643  kernel/irq/handle.c                      |    6 -
2644  kernel/irq/irqdesc.c                     |   14 +-
2645  kernel/irq/manage.c                      |   24 +-
2646  kernel/irq/spurious.c                    |   31 +-
2647  kernel/sched.c                           |   16 +-
2648  kernel/sched_rt.c                        |    4 +-
2649  kernel/sysctl.c                          |    6 +
2650  kernel/time/clockevents.c                |    5 +-
2651  kernel/timer.c                           |   15 +-
2652  tools/perf/Documentation/perf-script.txt |   12 +-
2653  tools/perf/builtin-script.c              |  108 +-
2654  tools/perf/builtin-stat.c                |    9 +-
2655  tools/perf/builtin-test.c                |    2 +-
2656  tools/perf/util/event.c                  |   16 -
2657  tools/perf/util/event.h                  |    2 -
2658  tools/perf/util/evlist.c                 |   68 +-
2659  tools/perf/util/evlist.h                 |    6 +-
2660  tools/perf/util/evsel.c                  |   17 +
2661  tools/perf/util/evsel.h                  |    8 +
2662  tools/perf/util/python.c                 |   29 +-
2663  tools/perf/util/session.c                |   73 +-
2664  tools/perf/util/session.h                |    5 +-
2665  36 files changed, 2132 insertions(+), 1726 deletions(-)
2666 Merging rcu/rcu/next
2667 $ git merge rcu/rcu/next
2668 Resolved 'kernel/rcutree.c' using previous resolution.
2669 Auto-merging include/linux/lockdep.h
2670 Auto-merging kernel/lockdep.c
2671 Auto-merging kernel/rcutree.c
2672 CONFLICT (content): Merge conflict in kernel/rcutree.c
2673 Auto-merging kernel/rcutree_plugin.h
2674 Automatic merge failed; fix conflicts and then commit the result.
2675 $ git commit -v -a
2676 [master 01081b5] Merge remote-tracking branch 'rcu/rcu/next'
2677 $ git diff -M --stat --summary HEAD^..
2678  include/linux/lockdep.h  |    2 +-
2679  include/linux/rcupdate.h |   22 ++++++++++++++--------
2680  kernel/lockdep.c         |   11 ++++++-----
2681  kernel/pid.c             |    4 +++-
2682  kernel/rcutorture.c      |    3 ++-
2683  kernel/rcutree.c         |   13 ++++++++++++-
2684  kernel/rcutree_plugin.h  |   13 +++++++------
2685  7 files changed, 45 insertions(+), 23 deletions(-)
2686 Merging kvm/linux-next
2687 $ git merge kvm/linux-next
2688 Merge made by recursive.
2689  virt/kvm/kvm_main.c |    4 +++-
2690  1 files changed, 3 insertions(+), 1 deletions(-)
2691 Merging oprofile/for-next
2692 $ git merge oprofile/for-next
2693 Auto-merging arch/x86/kernel/apic/apic.c
2694 Merge made by recursive.
2695  arch/x86/kernel/apic/apic.c      |    3 ++-
2696  arch/x86/oprofile/op_model_amd.c |   13 +++++++++----
2697  2 files changed, 11 insertions(+), 5 deletions(-)
2698 Merging ptrace/ptrace
2699 $ git merge ptrace/ptrace
2700 Auto-merging include/linux/sched.h
2701 Merge made by recursive.
2702  fs/exec.c                 |    2 +-
2703  include/linux/ptrace.h    |    2 +-
2704  include/linux/sched.h     |   27 ++++--
2705  include/linux/tracehook.h |   52 -----------
2706  kernel/ptrace.c           |   52 ++++++++----
2707  kernel/signal.c           |  212 +++++++++++++++++++++++++--------------------
2708  6 files changed, 175 insertions(+), 172 deletions(-)
2709 Merging xen/upstream/xen
2710 $ git merge xen/upstream/xen
2711 Already up-to-date.
2712 Merging xen-two/linux-next
2713 $ git merge xen-two/linux-next
2714 Merge made by recursive.
2715  arch/x86/xen/multicalls.c |   12 ++++++------
2716  drivers/xen/events.c      |   18 +++++++++---------
2717  2 files changed, 15 insertions(+), 15 deletions(-)
2718 Merging xen-pvhvm/linux-next
2719 $ git merge xen-pvhvm/linux-next
2720 Already up-to-date.
2721 Merging edac-amd/for-next
2722 $ git merge edac-amd/for-next
2723 Already up-to-date.
2724 Merging percpu/for-next
2725 $ git merge percpu/for-next
2726 Merge made by recursive.
2727 Merging workqueues/for-next
2728 $ git merge workqueues/for-next
2729 Auto-merging Documentation/feature-removal-schedule.txt
2730 Auto-merging kernel/workqueue.c
2731 Merge made by recursive.
2732  Documentation/feature-removal-schedule.txt |   10 ----
2733  include/linux/workqueue.h                  |   18 +------
2734  kernel/workqueue.c                         |   81 ++++++++++++++++++----------
2735  3 files changed, 55 insertions(+), 54 deletions(-)
2736 Merging sfi/sfi-test
2737 $ git merge sfi/sfi-test
2738 Already up-to-date.
2739 Merging asm-generic/next
2740 $ git merge asm-generic/next
2741 Already up-to-date.
2742 Merging drivers-x86/linux-next
2743 $ git merge drivers-x86/linux-next
2744 Already up-to-date.
2745 Merging hwpoison/hwpoison
2746 $ git merge hwpoison/hwpoison
2747 Already up-to-date.
2748 Merging sysctl/master
2749 $ git merge sysctl/master
2750 Already up-to-date.
2751 Merging namespace/master
2752 $ git merge namespace/master
2753 Already up-to-date.
2754 Merging driver-core/driver-core-next
2755 $ git merge driver-core/driver-core-next
2756 Already up-to-date.
2757 Merging tty/tty-next
2758 $ git merge tty/tty-next
2759 Already up-to-date.
2760 Merging usb/usb-next
2761 $ git merge usb/usb-next
2762 Auto-merging drivers/usb/host/xhci-dbg.c
2763 Auto-merging drivers/usb/host/xhci-mem.c
2764 Auto-merging drivers/usb/host/xhci-ring.c
2765 Auto-merging drivers/usb/host/xhci.c
2766 Auto-merging drivers/usb/host/xhci.h
2767 Merge made by recursive.
2768  Documentation/kernel-parameters.txt |    5 +
2769  drivers/usb/core/hcd.c              |   17 +-
2770  drivers/usb/gadget/Kconfig          |   29 +
2771  drivers/usb/gadget/Makefile         |    1 +
2772  drivers/usb/gadget/fusb300_udc.c    |    5 -
2773  drivers/usb/gadget/gadget_chips.h   |    8 +
2774  drivers/usb/gadget/net2272.c        | 2718 +++++++++++++++++++++++++++++++++++
2775  drivers/usb/gadget/net2272.h        |  601 ++++++++
2776  drivers/usb/host/ehci-s5p.c         |   95 ++
2777  drivers/usb/host/xhci-dbg.c         |   22 +-
2778  drivers/usb/host/xhci-mem.c         |   26 +-
2779  drivers/usb/host/xhci-ring.c        |   42 +-
2780  drivers/usb/host/xhci.c             |   10 +-
2781  drivers/usb/host/xhci.h             |    7 +
2782  14 files changed, 3525 insertions(+), 61 deletions(-)
2783  create mode 100644 drivers/usb/gadget/net2272.c
2784  create mode 100644 drivers/usb/gadget/net2272.h
2785 Merging staging/staging-next
2786 $ git merge staging/staging-next
2787 Already up-to-date.
2788 Merging bkl-config/config
2789 $ git merge bkl-config/config
2790 Already up-to-date.
2791 Merging tmem/linux-next
2792 $ git merge tmem/linux-next
2793 Merge made by recursive.
2794  .../ABI/testing/sysfs-kernel-mm-frontswap          |   16 +
2795  Documentation/vm/frontswap.txt                     |  210 ++++++++++++
2796  drivers/xen/Kconfig                                |    4 +
2797  drivers/xen/Makefile                               |    2 +-
2798  drivers/xen/tmem.c                                 |  158 +++++++++-
2799  include/linux/frontswap.h                          |   92 ++++++
2800  include/linux/swap.h                               |    2 +
2801  include/linux/swapfile.h                           |   13 +
2802  mm/Kconfig                                         |   16 +
2803  mm/Makefile                                        |    1 +
2804  mm/frontswap.c                                     |  335 ++++++++++++++++++++
2805  mm/page_io.c                                       |   12 +
2806  mm/swapfile.c                                      |   65 +++-
2807  13 files changed, 903 insertions(+), 23 deletions(-)
2808  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-frontswap
2809  create mode 100644 Documentation/vm/frontswap.txt
2810  create mode 100644 include/linux/frontswap.h
2811  create mode 100644 include/linux/swapfile.h
2812  create mode 100644 mm/frontswap.c
2813 Merging arm-dt/devicetree/arm-next
2814 $ git merge arm-dt/devicetree/arm-next
2815 Already up-to-date.
2816 Merging scsi-post-merge/merge-base:master
2817 $ date
2818 Tue Jun  7 13:30:41 EST 2011