2 Tuesday 10 December 10:17:46 EST 2013
5 $ git reset --hard stable
6 HEAD is now at 374b105797c3 Linux 3.13-rc3
7 Merging origin/master (78fd82238d0e Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux)
8 $ git merge origin/master
9 Updating 374b105797c3..78fd82238d0e
12 Documentation/mic/mpssd/mpssd.c | 18 +-
14 arch/arm64/Kconfig | 3 +-
15 arch/arm64/include/asm/io.h | 2 +-
16 arch/arm64/include/asm/pgtable-hwdef.h | 2 +-
17 arch/arm64/kernel/head.S | 3 +-
18 arch/arm64/mm/proc.S | 2 +-
19 drivers/base/power/main.c | 3 -
20 drivers/char/i8k.c | 7 +
21 drivers/cpufreq/cpufreq.c | 46 +--
22 drivers/extcon/extcon-arizona.c | 4 +-
23 drivers/extcon/extcon-class.c | 3 +-
24 drivers/gpu/drm/drm_edid.c | 4 +-
25 drivers/gpu/drm/exynos/exynos_drm_drv.c | 35 +-
26 drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
27 drivers/gpu/drm/i915/i915_drv.c | 2 +
28 drivers/gpu/drm/i915/i915_gem.c | 7 +-
29 drivers/gpu/drm/i915/i915_gem_dmabuf.c | 13 +-
30 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 60 +--
31 drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-
32 drivers/gpu/drm/i915/i915_reg.h | 1 +
33 drivers/gpu/drm/i915/intel_ddi.c | 5 +-
34 drivers/gpu/drm/i915/intel_display.c | 14 +-
35 drivers/gpu/drm/i915/intel_dp.c | 34 +-
36 drivers/gpu/drm/i915/intel_drv.h | 2 +-
37 drivers/gpu/drm/i915/intel_pm.c | 15 +-
38 drivers/gpu/drm/nouveau/Makefile | 1 +
39 drivers/gpu/drm/nouveau/core/engine/device/nv50.c | 4 +-
40 drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c | 3 +
41 drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c | 3 +
42 .../gpu/drm/nouveau/core/engine/software/nv50.c | 2 +-
43 .../gpu/drm/nouveau/core/include/subdev/clock.h | 4 +
44 drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c | 7 +-
45 drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c | 445 +++++++++++++++++++++
46 drivers/gpu/drm/nouveau/dispnv04/overlay.c | 42 +-
47 drivers/gpu/drm/nouveau/nouveau_display.c | 3 +-
48 drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
49 drivers/gpu/drm/radeon/atombios_i2c.c | 15 +-
50 drivers/gpu/drm/radeon/dce6_afmt.c | 12 +-
51 drivers/gpu/drm/radeon/ni_dpm.c | 28 +-
52 drivers/gpu/drm/radeon/r600_hdmi.c | 8 +-
53 drivers/gpu/drm/radeon/radeon.h | 8 +-
54 drivers/gpu/drm/radeon/radeon_atombios.c | 2 +-
55 drivers/gpu/drm/radeon/radeon_cs.c | 4 +-
56 drivers/gpu/drm/radeon/radeon_drv.h | 3 +-
57 drivers/gpu/drm/radeon/radeon_gart.c | 16 +-
58 drivers/gpu/drm/radeon/radeon_pm.c | 49 +--
59 drivers/gpu/drm/radeon/radeon_trace.h | 33 ++
60 drivers/gpu/drm/radeon/reg_srcs/cayman | 4 +-
61 drivers/gpu/drm/radeon/reg_srcs/evergreen | 4 +-
62 drivers/gpu/drm/radeon/si.c | 11 +-
63 drivers/gpu/drm/tegra/drm.c | 34 +-
64 drivers/gpu/drm/tegra/drm.h | 2 +-
65 drivers/gpu/drm/tegra/fb.c | 2 +-
66 drivers/gpu/drm/tegra/rgb.c | 11 +-
67 drivers/gpu/drm/udl/udl_gem.c | 6 +
68 drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 2 +
69 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 +
70 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1 +
71 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +
72 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 118 ++++--
73 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 +
74 drivers/gpu/host1x/bus.c | 5 +-
75 drivers/gpu/host1x/hw/cdma_hw.c | 4 +-
76 drivers/gpu/host1x/hw/debug_hw.c | 4 +-
77 drivers/hid/hid-sensor-hub.c | 20 +-
78 drivers/iio/common/hid-sensors/Kconfig | 9 -
79 .../iio/common/hid-sensors/hid-sensor-trigger.c | 20 +-
80 drivers/iio/light/Kconfig | 1 +
81 drivers/input/keyboard/adp5588-keys.c | 3 +-
82 drivers/input/keyboard/adp5589-keys.c | 3 +-
83 drivers/input/keyboard/bf54x-keys.c | 3 +-
84 drivers/input/misc/pcf8574_keypad.c | 7 +-
85 drivers/input/mouse/alps.c | 206 +++++++++-
86 drivers/input/mouse/alps.h | 1 +
87 drivers/input/mouse/elantech.c | 1 +
88 drivers/input/touchscreen/sur40.c | 4 +-
89 drivers/input/touchscreen/usbtouchscreen.c | 22 +-
90 drivers/mfd/Kconfig | 2 +-
91 drivers/mfd/lpc_ich.c | 2 +-
92 drivers/mfd/ti-ssp.c | 2 +-
93 drivers/misc/mei/hw-me-regs.h | 5 +-
94 drivers/misc/mei/pci-me.c | 4 +-
95 drivers/misc/mic/card/mic_virtio.c | 33 +-
96 drivers/misc/mic/card/mic_virtio.h | 7 +-
97 drivers/misc/mic/host/mic_boot.c | 2 +-
98 drivers/misc/mic/host/mic_virtio.c | 30 +-
99 drivers/misc/mic/host/mic_x100.c | 4 +-
100 drivers/staging/tidspbridge/rmgr/drv_interface.c | 13 +-
101 drivers/tty/n_tty.c | 6 +-
102 drivers/usb/class/cdc-acm.c | 2 +
103 drivers/usb/core/hub.c | 5 +-
104 drivers/usb/dwc3/ep0.c | 2 +
105 drivers/usb/dwc3/gadget.c | 5 +-
106 drivers/usb/gadget/Kconfig | 1 +
107 drivers/usb/gadget/composite.c | 1 +
108 drivers/usb/gadget/f_fs.c | 2 +-
109 drivers/usb/gadget/f_mass_storage.c | 27 +-
110 drivers/usb/gadget/pxa25x_udc.c | 1 +
111 drivers/usb/gadget/s3c-hsotg.c | 7 +-
112 drivers/usb/gadget/storage_common.h | 4 -
113 drivers/usb/gadget/tcm_usb_gadget.c | 2 +-
114 drivers/usb/gadget/zero.c | 6 +-
115 drivers/usb/host/ohci-pxa27x.c | 1 +
116 drivers/usb/host/xhci-ring.c | 54 ++-
117 drivers/usb/musb/musb_core.c | 9 +-
118 drivers/usb/musb/musb_cppi41.c | 164 ++++++--
119 drivers/usb/musb/musb_gadget.c | 4 +
120 drivers/usb/phy/phy-am335x.c | 5 +-
121 drivers/usb/phy/phy-generic.c | 68 ++--
122 drivers/usb/phy/phy-generic.h | 4 +-
123 drivers/usb/phy/phy-mxs-usb.c | 2 +-
124 drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +-
125 drivers/usb/serial/ftdi_sio.c | 37 +-
126 drivers/usb/serial/generic.c | 12 +-
127 drivers/usb/serial/mos7840.c | 32 +-
128 drivers/usb/serial/option.c | 27 ++
129 drivers/usb/serial/pl2303.c | 30 +-
130 drivers/usb/serial/spcp8x5.c | 30 +-
131 drivers/usb/wusbcore/devconnect.c | 72 ++--
132 drivers/usb/wusbcore/security.c | 98 +++--
133 drivers/usb/wusbcore/wusbhc.h | 6 +-
134 include/crypto/scatterwalk.h | 2 +-
135 include/linux/cpufreq.h | 8 -
136 include/linux/hid-sensor-hub.h | 2 +
137 include/linux/hid-sensor-ids.h | 12 +
138 include/linux/usb.h | 2 +
139 include/linux/usb/wusb.h | 2 +
140 include/uapi/linux/input.h | 3 +
141 include/uapi/linux/mic_common.h | 40 +-
142 tools/usb/Makefile | 5 +-
143 132 files changed, 1714 insertions(+), 717 deletions(-)
144 create mode 100644 drivers/gpu/drm/nouveau/core/subdev/clock/nvaa.c
145 Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
146 $ git merge fixes/master
148 Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
149 $ git merge kbuild-current/rc-fixes
151 Merging arc-current/for-curr (da990a4f2d5a ARC: [perf] Fix a few thinkos)
152 $ git merge arc-current/for-curr
153 Merge made by the 'recursive' strategy.
154 arch/arc/Kconfig | 1 +
155 arch/arc/include/uapi/asm/unistd.h | 5 +++++
156 arch/arc/kernel/perf_event.c | 4 ++--
157 scripts/sortextable.c | 5 +++++
158 4 files changed, 13 insertions(+), 2 deletions(-)
159 Merging arm-current/fixes (e36056f52000 ARM: another fix for the DMA mapping checks)
160 $ git merge arm-current/fixes
161 Merge made by the 'recursive' strategy.
162 arch/arm/mm/dma-mapping.c | 4 ++--
163 1 file changed, 2 insertions(+), 2 deletions(-)
164 Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
165 $ git merge m68k-current/for-linus
167 Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
168 $ git merge metag-fixes/fixes
170 Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue)
171 $ git merge powerpc-merge/merge
173 Merging sparc/master (1de425c7b271 sparc64: Fix build regression)
174 $ git merge sparc/master
175 Merge made by the 'recursive' strategy.
176 arch/sparc/kernel/kgdb_64.c | 1 +
177 1 file changed, 1 insertion(+)
178 Merging net/master (98bfd23cdb30 virtio-net: free bufs correctly on invalid packet length)
179 $ git merge net/master
180 Auto-merging MAINTAINERS
181 Merge made by the 'recursive' strategy.
182 .../devicetree/bindings/net/davinci_emac.txt | 2 +-
184 drivers/net/bonding/bond_main.c | 6 +-
185 drivers/net/bonding/bond_sysfs.c | 4 +-
186 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 5 +
187 drivers/net/ethernet/broadcom/tg3.c | 26 +-
188 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 82 +++---
189 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 278 +++++++++++----------
190 drivers/net/ethernet/chelsio/cxgb4/sge.c | 12 +-
191 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 230 ++++++++++-------
192 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 14 ++
193 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 7 +-
194 drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 1 -
195 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +-
196 drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
197 drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 24 +-
198 drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 4 +-
199 drivers/net/ethernet/emulex/benet/be_hw.h | 3 +
200 drivers/net/ethernet/emulex/benet/be_main.c | 41 ++-
201 drivers/net/ethernet/freescale/fec_main.c | 9 +-
202 drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +-
203 drivers/net/ethernet/marvell/mvneta.c | 4 +-
204 drivers/net/ethernet/mellanox/mlx4/main.c | 2 +
205 drivers/net/ethernet/nvidia/forcedeth.c | 8 +-
206 drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +-
207 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 4 +
208 drivers/net/ethernet/qlogic/qlge/qlge_main.c | 8 -
209 drivers/net/ethernet/tehuti/tehuti.c | 1 -
210 drivers/net/ethernet/ti/cpsw.c | 2 +
211 drivers/net/ethernet/ti/davinci_emac.c | 26 +-
212 drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
213 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
214 drivers/net/macvtap.c | 2 +
215 drivers/net/tun.c | 2 +
216 drivers/net/virtio_net.c | 17 +-
217 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 +-
218 drivers/net/wireless/ath/ath9k/hw.c | 7 +-
219 drivers/net/wireless/ath/wcn36xx/smd.c | 19 +-
220 drivers/net/wireless/brcm80211/Kconfig | 2 +
221 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 +
222 drivers/net/wireless/iwlwifi/iwl-7000.c | 29 ++-
223 drivers/net/wireless/iwlwifi/iwl-config.h | 5 +
224 drivers/net/wireless/iwlwifi/iwl-csr.h | 5 +-
225 drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 +-
226 drivers/net/wireless/iwlwifi/mvm/d3.c | 5 +-
227 drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 +
228 drivers/net/wireless/iwlwifi/mvm/time-event.c | 7 +-
229 drivers/net/wireless/iwlwifi/pcie/drv.c | 21 ++
230 drivers/net/wireless/iwlwifi/pcie/internal.h | 8 +
231 drivers/net/wireless/iwlwifi/pcie/rx.c | 7 +-
232 drivers/net/wireless/iwlwifi/pcie/trans.c | 3 -
233 drivers/net/wireless/iwlwifi/pcie/tx.c | 6 +-
234 drivers/net/wireless/mac80211_hwsim.c | 16 +-
235 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
236 drivers/net/xen-netback/interface.c | 20 +-
237 drivers/net/xen-netback/netback.c | 236 +++++++++--------
238 drivers/pci/pci.c | 8 +
239 include/linux/ipv6.h | 1 +
240 include/linux/pci.h | 1 +
241 include/linux/skbuff.h | 39 ++-
242 include/net/ipv6.h | 3 +-
243 include/net/sock.h | 6 +-
244 net/bridge/br_private.h | 10 +
245 net/bridge/br_stp_bpdu.c | 2 +-
246 net/core/skbuff.c | 1 +
247 net/ipv4/tcp_memcontrol.c | 7 -
248 net/ipv6/addrconf.c | 2 +-
249 net/ipv6/ndisc.c | 3 +
250 net/ipv6/route.c | 22 +-
251 net/mac80211/cfg.c | 15 +-
252 net/mac80211/ibss.c | 4 +
253 net/mac80211/ieee80211_i.h | 1 +
254 net/mac80211/iface.c | 1 -
255 net/mac80211/main.c | 3 +
256 net/mac80211/mesh.c | 20 +-
257 net/mac80211/mlme.c | 2 +
258 net/mac80211/rc80211_minstrel_ht.c | 7 +-
259 net/mac80211/rx.c | 3 +-
260 net/mac80211/scan.c | 2 +-
261 net/mac80211/spectmgmt.c | 2 +
262 net/mac80211/util.c | 11 +-
263 net/rds/ib_send.c | 5 +-
264 net/sched/act_api.c | 26 +-
265 net/sched/act_csum.c | 2 -
266 net/sched/act_gact.c | 2 -
267 net/sched/act_ipt.c | 4 -
268 net/sched/act_mirred.c | 2 -
269 net/sched/act_nat.c | 2 -
270 net/sched/act_pedit.c | 2 -
271 net/sched/act_police.c | 1 -
272 net/sched/act_simple.c | 1 -
273 net/sched/act_skbedit.c | 1 -
274 net/sctp/transport.c | 2 +-
275 net/wireless/core.c | 9 +
276 net/wireless/ibss.c | 18 +-
277 net/wireless/nl80211.c | 60 +++--
278 96 files changed, 979 insertions(+), 619 deletions(-)
279 Merging ipsec/master (239c78db9c41 net: clear local_df when passing skb between namespaces)
280 $ git merge ipsec/master
282 Merging sound-current/for-linus (31660e9084df ALSA: hda - Remove quirk for Dell Vostro 131)
283 $ git merge sound-current/for-linus
284 Merge made by the 'recursive' strategy.
285 sound/pci/hda/patch_conexant.c | 1 -
286 sound/pci/hda/patch_realtek.c | 8 ++++++++
287 sound/usb/mixer_quirks.c | 2 +-
288 3 files changed, 9 insertions(+), 2 deletions(-)
289 Merging pci-current/for-linus (4fc9bbf98fd6 PCI: Disable Bus Master only on kexec reboot)
290 $ git merge pci-current/for-linus
291 Auto-merging kernel/workqueue.c
292 Auto-merging include/linux/pci.h
293 Merge made by the 'recursive' strategy.
294 drivers/pci/host/pci-mvebu.c | 5 +++++
295 drivers/pci/pci-driver.c | 38 ++++++++++++++++++++++++++++++--------
296 drivers/pci/remove.c | 4 +++-
297 include/linux/kexec.h | 3 +++
298 include/linux/pci.h | 30 +++++++++++++++---------------
299 kernel/kexec.c | 4 ++++
300 kernel/workqueue.c | 32 ++++++++++----------------------
301 7 files changed, 70 insertions(+), 46 deletions(-)
302 Merging wireless/master (bbf807bc0697 ath9k: fix duration calculation for non-aggregated packets)
303 $ git merge wireless/master
304 Merge made by the 'recursive' strategy.
305 drivers/net/wireless/ath/ath9k/xmit.c | 4 ++++
306 1 file changed, 4 insertions(+)
307 Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files)
308 $ git merge driver-core.current/driver-core-linus
309 Merge made by the 'recursive' strategy.
310 fs/sysfs/file.c | 8 +++-----
311 1 file changed, 3 insertions(+), 5 deletions(-)
312 Merging tty.current/tty-linus (39434abd942c n_tty: Fix missing newline echo)
313 $ git merge tty.current/tty-linus
315 Merging usb.current/usb-linus (5a1e1456fc63 usb: chipidea: fix nobody cared IRQ when booting with host role)
316 $ git merge usb.current/usb-linus
317 Merge made by the 'recursive' strategy.
318 drivers/usb/chipidea/core.c | 4 ++++
319 drivers/usb/chipidea/host.c | 3 ++-
320 drivers/usb/chipidea/udc.c | 3 ---
321 drivers/usb/class/cdc-wdm.c | 8 +++-----
322 drivers/usb/dwc3/core.c | 8 +++++---
323 drivers/usb/phy/phy-tegra-usb.c | 2 +-
324 drivers/usb/phy/phy-twl6030-usb.c | 3 ++-
325 drivers/usb/serial/option.c | 2 ++
326 drivers/usb/serial/zte_ev.c | 3 +--
327 9 files changed, 20 insertions(+), 16 deletions(-)
328 Merging staging.current/staging-linus (55ef003e4ae6 Merge tag 'iio-fixes-for-3.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
329 $ git merge staging.current/staging-linus
331 Merging char-misc.current/char-misc-linus (76a9635979e5 mei: add 9 series PCH mei device ids)
332 $ git merge char-misc.current/char-misc-linus
334 Merging input-current/for-linus (95f75e91588a Input: ALPS - add support for DualPoint device on Dell XT2 model)
335 $ git merge input-current/for-linus
337 Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
338 $ git merge md-current/for-linus
340 Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries)
341 $ git merge crypto-current/master
343 Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata())
344 $ git merge ide/master
346 Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
347 $ git merge dwmw2/master
349 Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
350 $ git merge sh-current/sh-fixes-for-linus
352 Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
353 $ git merge devicetree-current/devicetree/merge
355 Merging rr-fixes/fixes (3459f11a8b16 virtio_balloon: update_balloon_size(): update correct field)
356 $ git merge rr-fixes/fixes
357 Merge made by the 'recursive' strategy.
358 drivers/virtio/virtio_balloon.c | 2 +-
359 1 file changed, 1 insertion(+), 1 deletion(-)
360 Merging mfd-fixes/master (88ec6a4d8369 Merge tag 'mfd-lee-3.13-fixes-1' of git://git.linaro.org/people/ljones/mfd)
361 $ git merge mfd-fixes/master
363 Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
364 $ git merge vfio-fixes/for-linus
365 Merge made by the 'recursive' strategy.
366 drivers/iommu/arm-smmu.c | 66 ++++++++++++++++++++----------------------------
367 1 file changed, 28 insertions(+), 38 deletions(-)
368 Merging drm-intel-fixes/for-linux-next-fixes (acc240d41ea1 drm/i915: Fix use-after-free in do_switch)
369 $ git merge drm-intel-fixes/for-linux-next-fixes
370 Merge made by the 'recursive' strategy.
371 drivers/gpu/drm/i915/i915_dma.c | 12 +++---------
372 drivers/gpu/drm/i915/i915_drv.c | 1 +
373 drivers/gpu/drm/i915/i915_drv.h | 2 --
374 drivers/gpu/drm/i915/i915_gem_context.c | 16 ++++++++++++----
375 drivers/gpu/drm/i915/intel_display.c | 7 ++++---
376 drivers/gpu/drm/i915/intel_drv.h | 1 +
377 drivers/gpu/drm/i915/intel_pm.c | 11 ++++++++++-
378 7 files changed, 31 insertions(+), 19 deletions(-)
379 Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
380 $ git merge asm-generic/master
382 Merging arc/for-next (035a20627b46 ARC: [SMP] optimize IPI send and receive)
383 $ git merge arc/for-next
384 Merge made by the 'recursive' strategy.
385 arch/arc/include/asm/smp.h | 8 +--
386 arch/arc/kernel/smp.c | 124 +++++++++++++++++++++++++-------------------
387 arch/arc/plat-arcfpga/smp.c | 12 ++---
388 3 files changed, 78 insertions(+), 66 deletions(-)
389 Merging arm/for-next (4599b2b118c3 Merge branches 'fixes', 'kees' and 'misc' into for-next)
390 $ git merge arm/for-next
391 Merge made by the 'recursive' strategy.
392 arch/arm/Kconfig.debug | 23 +++
393 arch/arm/include/asm/cacheflush.h | 5 +
394 arch/arm/include/asm/io.h | 2 +-
395 arch/arm/include/asm/mach/map.h | 27 +--
396 arch/arm/include/asm/pgtable-2level.h | 1 +
397 arch/arm/include/asm/pgtable-3level.h | 1 +
398 arch/arm/include/asm/pgtable.h | 2 +
399 arch/arm/include/asm/xen/page.h | 2 +-
400 arch/arm/kernel/entry-v7m.S | 2 -
401 arch/arm/kernel/etm.c | 6 -
402 arch/arm/kernel/tcm.c | 4 +-
403 arch/arm/kernel/traps.c | 2 +-
404 arch/arm/lib/backtrace.S | 20 +-
405 arch/arm/mach-at91/setup.c | 2 +-
406 arch/arm/mach-omap2/io.c | 4 +-
407 arch/arm/mach-omap2/omap4-common.c | 2 +-
408 arch/arm/mach-ux500/setup.h | 2 +-
409 arch/arm/mm/Makefile | 1 +
410 arch/arm/mm/dma-mapping.c | 6 +-
411 arch/arm/mm/dump.c | 345 ++++++++++++++++++++++++++++++++++
412 arch/arm/mm/ioremap.c | 4 +-
413 arch/arm/mm/mmu.c | 126 ++++++++++---
414 drivers/input/serio/ambakmi.c | 2 -
415 drivers/mmc/host/mmci.c | 2 -
416 drivers/mtd/maps/pxa2xx-flash.c | 2 +-
417 25 files changed, 524 insertions(+), 71 deletions(-)
418 create mode 100644 arch/arm/mm/dump.c
419 Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1)
420 $ git merge arm-perf/for-next/perf
422 Merging arm-soc/for-next (883139c998a2 Merge branch 'next/soc' into for-next)
423 $ git merge arm-soc/for-next
424 Removing include/linux/platform_data/pinctrl-nomadik.h
425 Removing include/linux/platform_data/clocksource-nomadik-mtu.h
426 Auto-merging include/linux/clk/at91_pmc.h
427 Auto-merging arch/arm/mach-ux500/setup.h
428 Removing arch/arm/mach-ux500/devices.h
429 Removing arch/arm/mach-ux500/devices.c
430 Removing arch/arm/mach-ux500/devices-db8500.h
431 Removing arch/arm/mach-ux500/devices-db8500.c
432 Removing arch/arm/mach-ux500/board-mop500.c
433 Removing arch/arm/mach-s3c64xx/dma.c
434 Auto-merging arch/arm/mach-at91/setup.c
435 Merge made by the 'recursive' strategy.
436 .../devicetree/bindings/clock/at91-clock.txt | 339 +++++++++
437 .../devicetree/bindings/dma/ste-dma40.txt | 3 +
438 arch/arm/Kconfig | 1 +
439 arch/arm/arm-soc-for-next-contents.txt | 39 +
440 arch/arm/boot/dts/armada-370-mirabox.dts | 25 +-
441 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +-
442 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 32 +
443 arch/arm/boot/dts/armada-370-xp.dtsi | 9 +
444 arch/arm/boot/dts/armada-xp-gp.dts | 8 +
445 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 3 +-
446 arch/arm/boot/dts/dove-cubox.dts | 2 +-
447 arch/arm/boot/dts/dove.dtsi | 13 +-
448 arch/arm/boot/dts/kirkwood-6281.dtsi | 2 +
449 arch/arm/boot/dts/kirkwood-6282.dtsi | 2 +
450 arch/arm/boot/dts/kirkwood-dns320.dts | 2 +-
451 arch/arm/boot/dts/kirkwood-dns325.dts | 2 +-
452 arch/arm/boot/dts/kirkwood-dockstar.dts | 2 +-
453 arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 +-
454 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +-
455 arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 +-
456 arch/arm/boot/dts/kirkwood-iconnect.dts | 4 +-
457 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 2 +-
458 arch/arm/boot/dts/kirkwood-lsxl.dtsi | 2 +-
459 .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 14 +-
460 arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
461 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 2 +-
462 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +-
463 arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 +-
464 .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +-
465 arch/arm/boot/dts/sama5d3.dtsi | 379 +++++++++-
466 arch/arm/boot/dts/sama5d3_can.dtsi | 20 +
467 arch/arm/boot/dts/sama5d3_emac.dtsi | 11 +
468 arch/arm/boot/dts/sama5d3_gmac.dtsi | 11 +
469 arch/arm/boot/dts/sama5d3_lcd.dtsi | 17 +
470 arch/arm/boot/dts/sama5d3_mci2.dtsi | 12 +
471 arch/arm/boot/dts/sama5d3_tcb1.dtsi | 12 +
472 arch/arm/boot/dts/sama5d3_uart.dtsi | 21 +
473 arch/arm/boot/dts/sama5d3xcm.dtsi | 17 +-
474 arch/arm/boot/dts/st-pincfg.h | 2 +-
475 arch/arm/boot/dts/ste-dbx5x0.dtsi | 32 +
476 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 745 +++++++++++++++++++
477 arch/arm/boot/dts/ste-href-stuib.dtsi | 41 ++
478 arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 90 ++-
479 arch/arm/boot/dts/ste-href.dtsi | 78 +-
480 arch/arm/boot/dts/ste-hrefprev60.dtsi | 73 +-
481 arch/arm/boot/dts/ste-hrefv60plus.dtsi | 217 +++++-
482 arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 80 ++
483 arch/arm/boot/dts/ste-snowball.dts | 225 ++++++
484 arch/arm/boot/dts/stih415-pinctrl.dtsi | 36 +
485 arch/arm/boot/dts/stih415.dtsi | 53 ++
486 arch/arm/boot/dts/stih416-pinctrl.dtsi | 35 +
487 arch/arm/boot/dts/stih416.dtsi | 53 ++
488 arch/arm/boot/dts/stih41x-b2000.dtsi | 9 +
489 arch/arm/boot/dts/stih41x-b2020.dtsi | 22 +
490 arch/arm/common/timer-sp.c | 4 +-
491 arch/arm/configs/bockw_defconfig | 10 +-
492 arch/arm/configs/genmai_defconfig | 116 +++
493 arch/arm/configs/kirkwood_defconfig | 1 +
494 arch/arm/configs/kzm9d_defconfig | 1 +
495 arch/arm/configs/marzen_defconfig | 10 +-
496 arch/arm/configs/multi_v7_defconfig | 3 +
497 arch/arm/configs/mvebu_defconfig | 1 +
498 arch/arm/mach-at91/Kconfig | 43 ++
499 arch/arm/mach-at91/Kconfig.non_dt | 6 +
500 arch/arm/mach-at91/Makefile | 2 +-
501 arch/arm/mach-at91/at91rm9200.c | 2 +-
502 arch/arm/mach-at91/at91sam9260.c | 2 +-
503 arch/arm/mach-at91/at91sam9261.c | 2 +-
504 arch/arm/mach-at91/at91sam9263.c | 2 +-
505 arch/arm/mach-at91/at91sam926x_time.c | 14 +-
506 arch/arm/mach-at91/at91sam9g45.c | 2 +-
507 arch/arm/mach-at91/at91sam9n12.c | 2 +-
508 arch/arm/mach-at91/at91sam9rl.c | 2 +-
509 arch/arm/mach-at91/at91sam9x5.c | 2 +-
510 arch/arm/mach-at91/board-dt-sama5.c | 10 +-
511 arch/arm/mach-at91/clock.c | 7 +-
512 arch/arm/mach-at91/generic.h | 3 +-
513 arch/arm/mach-at91/pm.c | 2 +-
514 arch/arm/mach-at91/pm_slowclock.S | 2 +-
515 arch/arm/mach-at91/sama5d3.c | 344 +--------
516 arch/arm/mach-at91/setup.c | 8 +-
517 arch/arm/mach-clps711x/common.c | 4 +-
518 arch/arm/mach-davinci/devices-da8xx.c | 4 +-
519 arch/arm/mach-davinci/dm355.c | 3 +-
520 arch/arm/mach-davinci/dm365.c | 3 +-
521 arch/arm/mach-davinci/dm644x.c | 3 +-
522 arch/arm/mach-davinci/dm646x.c | 6 +-
523 arch/arm/mach-davinci/time.c | 4 +-
524 arch/arm/mach-dove/common.c | 15 +-
525 arch/arm/mach-ep93xx/Kconfig | 1 +
526 arch/arm/mach-ep93xx/core.c | 110 ++-
527 arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
528 arch/arm/mach-highbank/highbank.c | 23 +
529 arch/arm/mach-imx/time.c | 4 +-
530 arch/arm/mach-integrator/integrator_ap.c | 4 +-
531 arch/arm/mach-ixp4xx/common.c | 4 +-
532 arch/arm/mach-kirkwood/board-dt.c | 40 +-
533 arch/arm/mach-mmp/time.c | 4 +-
534 arch/arm/mach-msm/timer.c | 4 +-
535 arch/arm/mach-mvebu/coherency.c | 1 +
536 arch/arm/mach-mvebu/coherency.h | 4 +-
537 arch/arm/mach-mvebu/common.h | 1 -
538 arch/arm/mach-mvebu/hotplug.c | 1 +
539 arch/arm/mach-mvebu/platsmp.c | 4 +-
540 arch/arm/mach-mvebu/pmsu.c | 3 +-
541 arch/arm/mach-mvebu/system-controller.c | 5 +-
542 arch/arm/mach-omap1/time.c | 4 +-
543 arch/arm/mach-omap2/timer.c | 4 +-
544 arch/arm/mach-orion5x/board-dt.c | 2 +-
545 arch/arm/mach-orion5x/common.c | 7 +-
546 arch/arm/mach-orion5x/db88f5281-setup.c | 2 +-
547 arch/arm/mach-orion5x/irq.c | 1 +
548 arch/arm/mach-orion5x/pci.c | 4 +-
549 arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +-
550 arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
551 arch/arm/mach-orion5x/ts209-setup.c | 2 +-
552 arch/arm/mach-orion5x/ts78xx-setup.c | 2 +-
553 arch/arm/mach-pxa/time.c | 4 +-
554 arch/arm/mach-s3c64xx/Kconfig | 7 +-
555 arch/arm/mach-s3c64xx/Makefile | 2 +-
556 arch/arm/mach-s3c64xx/common.h | 5 +
557 arch/arm/mach-s3c64xx/dma.c | 762 -------------------
558 arch/arm/mach-s3c64xx/include/mach/dma.h | 144 ++--
559 arch/arm/mach-s3c64xx/pl080.c | 244 +++++++
560 arch/arm/mach-sa1100/time.c | 4 +-
561 arch/arm/mach-shmobile/board-ape6evm.c | 6 +-
562 arch/arm/mach-shmobile/board-bockw-reference.c | 1 -
563 arch/arm/mach-shmobile/board-lager-reference.c | 5 +-
564 arch/arm/mach-shmobile/board-lager.c | 2 +-
565 arch/arm/mach-shmobile/board-marzen.c | 25 +-
566 arch/arm/mach-shmobile/clock-r7s72100.c | 3 +
567 arch/arm/mach-shmobile/clock-r8a7790.c | 2 +-
568 arch/arm/mach-shmobile/clock-sh7372.c | 9 +-
569 arch/arm/mach-shmobile/clock-sh73a0.c | 14 +-
570 arch/arm/mach-shmobile/include/mach/r8a7779.h | 5 -
571 arch/arm/mach-shmobile/setup-r8a7779.c | 57 --
572 arch/arm/mach-shmobile/setup-r8a7790.c | 7 +-
573 arch/arm/mach-shmobile/setup-sh73a0.c | 16 +-
574 arch/arm/mach-u300/timer.c | 4 +-
575 arch/arm/mach-ux500/Makefile | 6 +-
576 arch/arm/mach-ux500/board-mop500-audio.c | 3 -
577 arch/arm/mach-ux500/board-mop500-pins.c | 804 ---------------------
578 arch/arm/mach-ux500/board-mop500-sdi.c | 2 -
579 arch/arm/mach-ux500/board-mop500.c | 78 --
580 arch/arm/mach-ux500/board-mop500.h | 1 -
581 arch/arm/mach-ux500/cpu-db8500.c | 22 +-
582 arch/arm/mach-ux500/cpu.c | 23 +-
583 arch/arm/mach-ux500/devices-db8500.c | 28 -
584 arch/arm/mach-ux500/devices-db8500.h | 19 -
585 arch/arm/mach-ux500/devices.c | 26 -
586 arch/arm/mach-ux500/devices.h | 15 -
587 arch/arm/mach-ux500/setup.h | 6 -
588 arch/arm/mach-ux500/timer.c | 76 +-
589 arch/arm/plat-iop/time.c | 4 +-
590 arch/arm/plat-omap/counter_32k.c | 4 +-
591 arch/arm/plat-orion/common.c | 9 +-
592 arch/arm/plat-orion/time.c | 7 +-
593 arch/arm/plat-samsung/devs.c | 10 +-
594 arch/arm/plat-samsung/dma-ops.c | 8 +-
595 arch/arm/plat-versatile/sched-clock.c | 4 +-
596 drivers/bus/mvebu-mbus.c | 10 +-
597 drivers/clk/Makefile | 1 +
598 drivers/clk/at91/Makefile | 12 +
599 drivers/clk/at91/clk-main.c | 187 +++++
600 drivers/clk/at91/clk-master.c | 270 +++++++
601 drivers/clk/at91/clk-peripheral.c | 410 +++++++++++
602 drivers/clk/at91/clk-pll.c | 531 ++++++++++++++
603 drivers/clk/at91/clk-plldiv.c | 135 ++++
604 drivers/clk/at91/clk-programmable.c | 366 ++++++++++
605 drivers/clk/at91/clk-smd.c | 171 +++++
606 drivers/clk/at91/clk-system.c | 135 ++++
607 drivers/clk/at91/clk-usb.c | 398 ++++++++++
608 drivers/clk/at91/clk-utmi.c | 159 ++++
609 drivers/clk/at91/pmc.c | 397 ++++++++++
610 drivers/clk/at91/pmc.h | 116 +++
611 drivers/clk/samsung/clk-s3c64xx.c | 4 +-
612 drivers/clocksource/nomadik-mtu.c | 23 +-
613 drivers/dma/ste_dma40.c | 4 +
614 drivers/gpio/gpio-davinci.c | 4 +-
615 drivers/pinctrl/pinctrl-nomadik.c | 296 ++++++--
616 drivers/pinctrl/pinctrl-nomadik.h | 14 +-
617 drivers/spi/Kconfig | 2 +-
618 drivers/usb/gadget/atmel_usba_udc.c | 2 +-
619 include/dt-bindings/clk/at91.h | 22 +
620 .../include/mach => include/linux/clk}/at91_pmc.h | 4 +-
621 .../linux/platform_data/clocksource-nomadik-mtu.h | 9 -
622 include/linux/platform_data/pinctrl-nomadik.h | 242 -------
623 187 files changed, 7181 insertions(+), 2938 deletions(-)
624 create mode 100644 Documentation/devicetree/bindings/clock/at91-clock.txt
625 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
626 create mode 100644 arch/arm/boot/dts/ste-href-family-pinctrl.dtsi
627 create mode 100644 arch/arm/configs/genmai_defconfig
628 delete mode 100644 arch/arm/mach-s3c64xx/dma.c
629 create mode 100644 arch/arm/mach-s3c64xx/pl080.c
630 delete mode 100644 arch/arm/mach-ux500/board-mop500.c
631 delete mode 100644 arch/arm/mach-ux500/devices-db8500.c
632 delete mode 100644 arch/arm/mach-ux500/devices-db8500.h
633 delete mode 100644 arch/arm/mach-ux500/devices.c
634 delete mode 100644 arch/arm/mach-ux500/devices.h
635 create mode 100644 drivers/clk/at91/Makefile
636 create mode 100644 drivers/clk/at91/clk-main.c
637 create mode 100644 drivers/clk/at91/clk-master.c
638 create mode 100644 drivers/clk/at91/clk-peripheral.c
639 create mode 100644 drivers/clk/at91/clk-pll.c
640 create mode 100644 drivers/clk/at91/clk-plldiv.c
641 create mode 100644 drivers/clk/at91/clk-programmable.c
642 create mode 100644 drivers/clk/at91/clk-smd.c
643 create mode 100644 drivers/clk/at91/clk-system.c
644 create mode 100644 drivers/clk/at91/clk-usb.c
645 create mode 100644 drivers/clk/at91/clk-utmi.c
646 create mode 100644 drivers/clk/at91/pmc.c
647 create mode 100644 drivers/clk/at91/pmc.h
648 create mode 100644 include/dt-bindings/clk/at91.h
649 rename {arch/arm/mach-at91/include/mach => include/linux/clk}/at91_pmc.h (98%)
650 delete mode 100644 include/linux/platform_data/clocksource-nomadik-mtu.h
651 delete mode 100644 include/linux/platform_data/pinctrl-nomadik.h
652 Merging arm-v7-cache-opt/v7-cache-opt (e11d68fee368 arm: mm: refactor v7 cache cleaning ops to use way/index sequence)
653 $ git merge arm-v7-cache-opt/v7-cache-opt
654 Merge made by the 'recursive' strategy.
655 arch/arm/mm/cache-v7.S | 14 +++++++-------
656 1 file changed, 7 insertions(+), 7 deletions(-)
657 Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' into for-next)
658 $ git merge bcm2835/for-next
659 Auto-merging arch/arm/boot/dts/bcm2835.dtsi
660 Merge made by the 'recursive' strategy.
661 arch/arm/boot/dts/bcm2835-rpi-b.dts | 9 +++++++--
662 arch/arm/boot/dts/bcm2835.dtsi | 6 ++++++
663 arch/arm/configs/bcm2835_defconfig | 37 +++++++++++++++++++++++--------------
664 arch/arm/mach-bcm2835/Kconfig | 2 +-
665 4 files changed, 37 insertions(+), 17 deletions(-)
666 Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S)
667 $ git merge cortex-m/for-next
668 Merge made by the 'recursive' strategy.
669 Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
670 $ git merge ep93xx/ep93xx-for-next
671 Merge made by the 'recursive' strategy.
672 Merging imx-mxs/for-next (683b9655e939 Merge branches 'imx/soc' and 'imx/dt' into for-next)
673 $ git merge imx-mxs/for-next
674 Auto-merging drivers/pinctrl/pinctrl-nomadik.c
675 Auto-merging arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
676 Auto-merging arch/arm/Kconfig.debug
677 Merge made by the 'recursive' strategy.
678 .../devicetree/bindings/clock/imx5-clock.txt | 195 +----
679 .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 22 +
680 .../devicetree/bindings/vendor-prefixes.txt | 3 +
681 arch/arm/Kconfig.debug | 9 +
682 arch/arm/boot/dts/Makefile | 19 +-
683 arch/arm/boot/dts/imx23-evk.dts | 8 +-
684 arch/arm/boot/dts/imx23-olinuxino.dts | 5 +-
685 arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 +-
686 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 60 ++
687 .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 119 +++
688 arch/arm/boot/dts/imx25-pinfunc.h | 494 +++++++++++
689 arch/arm/boot/dts/imx25-pingrp.h | 81 ++
690 arch/arm/boot/dts/imx25.dtsi | 18 +-
691 arch/arm/boot/dts/imx27-apf27.dts | 16 +
692 arch/arm/boot/dts/imx27-apf27dev.dts | 98 ++-
693 arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 50 +-
694 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 20 +-
695 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 56 +-
696 ...ycore-som.dts => imx27-phytec-phycore-som.dtsi} | 56 +-
697 arch/arm/boot/dts/imx27-pinfunc.h | 526 ++++++++++++
698 arch/arm/boot/dts/imx27-pingrp.h | 142 ++++
699 arch/arm/boot/dts/imx27.dtsi | 127 +--
700 arch/arm/boot/dts/imx28-apf28dev.dts | 18 +-
701 arch/arm/boot/dts/imx28-apx4devkit.dts | 5 +-
702 arch/arm/boot/dts/imx28-cfa10036.dts | 2 +
703 arch/arm/boot/dts/imx28-cfa10037.dts | 7 +-
704 arch/arm/boot/dts/imx28-cfa10049.dts | 31 +-
705 arch/arm/boot/dts/imx28-cfa10057.dts | 7 +-
706 arch/arm/boot/dts/imx28-cfa10058.dts | 7 +-
707 arch/arm/boot/dts/imx28-duckbill.dts | 121 +++
708 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 71 ++
709 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 50 ++
710 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 326 ++++++++
711 arch/arm/boot/dts/imx28-evk.dts | 24 +-
712 arch/arm/boot/dts/imx28-m28cu3.dts | 16 +-
713 arch/arm/boot/dts/imx28-m28evk.dts | 18 +-
714 arch/arm/boot/dts/imx28-sps1.dts | 7 +-
715 arch/arm/boot/dts/imx28-tx28.dts | 23 +-
716 arch/arm/boot/dts/imx28.dtsi | 58 +-
717 arch/arm/boot/dts/imx50-evk.dts | 97 +++
718 arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++++++
719 arch/arm/boot/dts/imx50-pingrp.h | 146 ++++
720 arch/arm/boot/dts/imx50.dtsi | 475 +++++++++++
721 arch/arm/boot/dts/imx51-apf51.dts | 18 +-
722 arch/arm/boot/dts/imx51-apf51dev.dts | 50 +-
723 arch/arm/boot/dts/imx51-babbage.dts | 100 ++-
724 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 71 ++
725 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 144 ++++
726 arch/arm/boot/dts/imx51-pingrp.h | 249 ++++++
727 arch/arm/boot/dts/imx51.dtsi | 456 ++--------
728 arch/arm/boot/dts/imx53-ard.dts | 19 +-
729 arch/arm/boot/dts/imx53-evk.dts | 38 +-
730 arch/arm/boot/dts/imx53-m53evk.dts | 133 ++-
731 arch/arm/boot/dts/imx53-mba53.dts | 40 +-
732 arch/arm/boot/dts/imx53-pingrp.h | 352 ++++++++
733 arch/arm/boot/dts/imx53-qsb.dts | 65 +-
734 arch/arm/boot/dts/imx53-smd.dts | 62 +-
735 arch/arm/boot/dts/imx53-tqma53.dtsi | 112 ++-
736 arch/arm/boot/dts/imx53-tx53.dtsi | 5 +-
737 arch/arm/boot/dts/imx53-voipac-bsb.dts | 144 ++++
738 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 240 ++++++
739 arch/arm/boot/dts/imx53.dtsi | 649 +++------------
740 arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 +
741 arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 +
742 arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 +
743 arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 +
744 arch/arm/boot/dts/imx6dl-pinfunc.h | 1 +
745 arch/arm/boot/dts/imx6dl.dtsi | 10 +-
746 arch/arm/boot/dts/imx6q-arm2.dts | 71 +-
747 arch/arm/boot/dts/imx6q-cm-fx6.dts | 69 ++
748 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 178 ++++
749 arch/arm/boot/dts/imx6q-gw51xx.dts | 19 +
750 arch/arm/boot/dts/imx6q-gw52xx.dts | 23 +
751 arch/arm/boot/dts/imx6q-gw53xx.dts | 23 +
752 arch/arm/boot/dts/imx6q-gw5400-a.dts | 493 +++++++++++
753 arch/arm/boot/dts/imx6q-gw54xx.dts | 23 +
754 arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 44 +-
755 arch/arm/boot/dts/imx6q-pinfunc.h | 1 +
756 arch/arm/boot/dts/imx6q-sabrelite.dts | 68 +-
757 arch/arm/boot/dts/imx6q-sbc6x.dts | 29 +-
758 arch/arm/boot/dts/imx6q-udoo.dts | 27 +-
759 arch/arm/boot/dts/imx6q.dtsi | 9 +-
760 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 317 +++++++
761 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 424 ++++++++++
762 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 484 +++++++++++
763 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 511 ++++++++++++
764 arch/arm/boot/dts/imx6qdl-pingrp.h | 526 ++++++++++++
765 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 58 +-
766 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 73 +-
767 arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 70 +-
768 arch/arm/boot/dts/imx6qdl.dtsi | 904 +++-----------------
769 arch/arm/boot/dts/imx6sl-evk.dts | 88 +-
770 arch/arm/boot/dts/imx6sl-pingrp.h | 148 ++++
771 arch/arm/boot/dts/imx6sl.dtsi | 339 ++------
772 arch/arm/configs/imx_v4_v5_defconfig | 2 +
773 arch/arm/configs/imx_v6_v7_defconfig | 4 +
774 arch/arm/include/debug/imx-uart.h | 10 +
775 arch/arm/mach-imx/Kconfig | 27 +-
776 arch/arm/mach-imx/Makefile | 1 +
777 arch/arm/mach-imx/avic.c | 25 -
778 arch/arm/mach-imx/clk-imx51-imx53.c | 804 +++++++++---------
779 arch/arm/mach-imx/clk-imx6q.c | 2 +-
780 arch/arm/mach-imx/clk-imx6sl.c | 2 +-
781 arch/arm/mach-imx/clk-pllv1.c | 23 +-
782 arch/arm/mach-imx/clk-vf610.c | 5 +
783 arch/arm/mach-imx/common.h | 1 +
784 arch/arm/mach-imx/irq-common.h | 1 -
785 arch/arm/mach-imx/mach-imx50.c | 38 +
786 arch/arm/mach-imx/mach-imx6q.c | 30 +
787 arch/arm/mach-imx/mm-imx5.c | 8 -
788 arch/arm/mach-mxs/mach-mxs.c | 33 +
789 drivers/pinctrl/Kconfig | 8 -
790 drivers/pinctrl/pinctrl-imx1-core.c | 7 +
791 drivers/pinctrl/pinctrl-nomadik.c | 6 +-
792 drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 36 +-
793 include/dt-bindings/clock/imx5-clock.h | 203 +++++
794 include/dt-bindings/clock/imx6sl-clock.h | 2 +-
795 include/dt-bindings/clock/vf610-clock.h | 6 +-
796 118 files changed, 10857 insertions(+), 3041 deletions(-)
797 create mode 100644 arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi
798 create mode 100644 arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts
799 create mode 100644 arch/arm/boot/dts/imx25-pinfunc.h
800 create mode 100644 arch/arm/boot/dts/imx25-pingrp.h
801 rename arch/arm/boot/dts/{imx27-phytec-phycore-som.dts => imx27-phytec-phycore-som.dtsi} (77%)
802 create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
803 create mode 100644 arch/arm/boot/dts/imx27-pingrp.h
804 create mode 100644 arch/arm/boot/dts/imx28-duckbill.dts
805 create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts
806 create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts
807 create mode 100644 arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi
808 create mode 100644 arch/arm/boot/dts/imx50-evk.dts
809 create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
810 create mode 100644 arch/arm/boot/dts/imx50-pingrp.h
811 create mode 100644 arch/arm/boot/dts/imx50.dtsi
812 create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
813 create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
814 create mode 100644 arch/arm/boot/dts/imx51-pingrp.h
815 create mode 100644 arch/arm/boot/dts/imx53-pingrp.h
816 create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
817 create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
818 create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
819 create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
820 create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
821 create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
822 create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
823 create mode 100644 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
824 create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
825 create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
826 create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
827 create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
828 create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
829 create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
830 create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
831 create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
832 create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
833 create mode 100644 arch/arm/boot/dts/imx6qdl-pingrp.h
834 create mode 100644 arch/arm/boot/dts/imx6sl-pingrp.h
835 create mode 100644 arch/arm/mach-imx/mach-imx50.c
836 create mode 100644 include/dt-bindings/clock/imx5-clock.h
837 Merging ixp4xx/next (19f949f52599 Linux 3.8)
838 $ git merge ixp4xx/next
840 Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
841 $ git merge msm/for-next
843 Merging mvebu/for-next (3054cde59b01 Merge branch 'mvebu/dt' into for-next)
844 $ git merge mvebu/for-next
845 Auto-merging arch/arm/boot/dts/Makefile
846 Merge made by the 'recursive' strategy.
847 .../interrupt-controller/marvell,dove-pmu-intc.txt | 17 ++
848 arch/arm/boot/dts/Makefile | 2 +
849 arch/arm/boot/dts/armada-370-netgear-rn102.dts | 118 +++++---
850 arch/arm/boot/dts/armada-370-netgear-rn104.dts | 104 ++++---
851 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 322 +++++++++++++++++++++
852 arch/arm/boot/dts/kirkwood-cloudbox.dts | 10 +-
853 arch/arm/boot/dts/kirkwood-db.dtsi | 4 +-
854 arch/arm/boot/dts/kirkwood-dns320.dts | 10 +-
855 arch/arm/boot/dts/kirkwood-dns325.dts | 10 +-
856 arch/arm/boot/dts/kirkwood-dnskw.dtsi | 18 +-
857 arch/arm/boot/dts/kirkwood-dockstar.dts | 4 +-
858 arch/arm/boot/dts/kirkwood-dreamplug.dts | 6 +-
859 arch/arm/boot/dts/kirkwood-goflexnet.dts | 22 +-
860 .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 8 +-
861 arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 +-
862 arch/arm/boot/dts/kirkwood-iconnect.dts | 24 +-
863 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 20 +-
864 arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +-
865 arch/arm/boot/dts/kirkwood-lsxl.dtsi | 28 +-
866 arch/arm/boot/dts/kirkwood-mplcec4.dts | 14 +-
867 arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 14 +-
868 .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 99 ++++---
869 .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 268 +++++++++++++++++
870 arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 8 +-
871 arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
872 arch/arm/boot/dts/kirkwood-ns2max.dts | 10 +-
873 arch/arm/boot/dts/kirkwood-ns2mini.dts | 10 +-
874 arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 4 +-
875 arch/arm/boot/dts/kirkwood-nsa310.dts | 32 +-
876 arch/arm/boot/dts/kirkwood-nsa310a.dts | 30 +-
877 arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 10 +-
878 arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 +-
879 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 6 +-
880 arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 +-
881 arch/arm/boot/dts/kirkwood-topkick.dts | 10 +-
882 arch/arm/boot/dts/kirkwood-ts219-6281.dts | 8 +-
883 arch/arm/boot/dts/kirkwood-ts219-6282.dts | 8 +-
884 arch/arm/boot/dts/kirkwood.dtsi | 2 +
885 drivers/clk/mvebu/Kconfig | 5 +
886 drivers/clk/mvebu/Makefile | 1 +
887 drivers/clk/mvebu/clk-corediv.c | 223 ++++++++++++++
888 drivers/clk/mvebu/clk-cpu.c | 2 +-
889 drivers/irqchip/Makefile | 1 +
890 drivers/irqchip/irq-dove.c | 126 ++++++++
891 44 files changed, 1362 insertions(+), 292 deletions(-)
892 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,dove-pmu-intc.txt
893 create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
894 create mode 100644 arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
895 create mode 100644 drivers/clk/mvebu/clk-corediv.c
896 create mode 100644 drivers/irqchip/irq-dove.c
897 Merging renesas/next (e715696ab1b7 Merge branch 'heads/usb-r8a66597-hcd' into next)
898 $ git merge renesas/next
899 Removing arch/arm/mach-shmobile/board-kzm9d.c
900 Auto-merging arch/arm/boot/dts/Makefile
901 Auto-merging arch/arm/Kconfig
902 Merge made by the 'recursive' strategy.
903 arch/arm/Kconfig | 14 +-
904 arch/arm/Makefile | 1 -
905 arch/arm/boot/compressed/Makefile | 2 +-
906 arch/arm/boot/dts/Makefile | 8 +-
907 arch/arm/boot/dts/emev2-kzm9d.dts | 39 ++++-
908 arch/arm/boot/dts/emev2.dtsi | 86 ++++++++++-
909 arch/arm/boot/dts/r7s72100-genmai-reference.dts | 31 ++++
910 arch/arm/boot/dts/r7s72100-genmai.dts | 2 +-
911 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 15 +-
912 arch/arm/boot/dts/r8a73a4-ape6evm.dts | 10 +-
913 arch/arm/boot/dts/r8a73a4.dtsi | 118 +++++++++-----
914 .../boot/dts/r8a7740-armadillo800eva-reference.dts | 13 +-
915 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
916 arch/arm/boot/dts/r8a7740.dtsi | 118 +++++++-------
917 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 57 ++++++-
918 arch/arm/boot/dts/r8a7778-bockw.dts | 2 +-
919 arch/arm/boot/dts/r8a7778.dtsi | 170 +++++++++++++++++++--
920 arch/arm/boot/dts/r8a7779-marzen-reference.dts | 25 ++-
921 arch/arm/boot/dts/r8a7779-marzen.dts | 2 +-
922 arch/arm/boot/dts/r8a7779.dtsi | 82 +++++++---
923 arch/arm/boot/dts/r8a7790-lager-reference.dts | 46 +++++-
924 arch/arm/boot/dts/r8a7790-lager.dts | 7 +-
925 arch/arm/boot/dts/r8a7790.dtsi | 97 +++++++-----
926 arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 61 ++++++++
927 arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
928 arch/arm/boot/dts/r8a7791.dtsi | 144 +++++++++++++++--
929 arch/arm/boot/dts/sh7372-mackerel.dts | 2 +-
930 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 70 ++++++++-
931 arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +-
932 arch/arm/boot/dts/sh73a0.dtsi | 142 ++++++++---------
933 arch/arm/configs/ape6evm_defconfig | 2 +-
934 arch/arm/configs/armadillo800eva_defconfig | 2 +-
935 arch/arm/configs/bockw_defconfig | 2 +-
936 arch/arm/configs/genmai_defconfig | 2 +-
937 arch/arm/configs/koelsch_defconfig | 2 +-
938 arch/arm/configs/kzm9d_defconfig | 2 +-
939 arch/arm/configs/kzm9g_defconfig | 2 +-
940 arch/arm/configs/lager_defconfig | 2 +-
941 arch/arm/configs/mackerel_defconfig | 2 +-
942 arch/arm/configs/marzen_defconfig | 2 +-
943 arch/arm/mach-shmobile/Kconfig | 51 ++++++-
944 arch/arm/mach-shmobile/Makefile | 5 +-
945 arch/arm/mach-shmobile/Makefile.boot | 5 +-
946 arch/arm/mach-shmobile/board-bockw-reference.c | 31 ++--
947 arch/arm/mach-shmobile/board-bockw.c | 13 +-
948 arch/arm/mach-shmobile/board-genmai-reference.c | 49 ++++++
949 arch/arm/mach-shmobile/board-koelsch-reference.c | 53 +++++++
950 arch/arm/mach-shmobile/board-koelsch.c | 73 ++++++++-
951 arch/arm/mach-shmobile/board-kzm9d.c | 92 -----------
952 arch/arm/mach-shmobile/board-lager-reference.c | 2 +
953 arch/arm/mach-shmobile/board-lager.c | 72 ++++++++-
954 arch/arm/mach-shmobile/board-mackerel.c | 4 +-
955 arch/arm/mach-shmobile/board-marzen.c | 2 -
956 arch/arm/mach-shmobile/clock-r7s72100.c | 1 +
957 arch/arm/mach-shmobile/clock-r8a73a4.c | 10 +-
958 arch/arm/mach-shmobile/clock-r8a7740.c | 8 +-
959 arch/arm/mach-shmobile/clock-r8a7778.c | 11 ++
960 arch/arm/mach-shmobile/clock-r8a7779.c | 8 +
961 arch/arm/mach-shmobile/clock-r8a7790.c | 45 +++---
962 arch/arm/mach-shmobile/clock-r8a7791.c | 14 +-
963 arch/arm/mach-shmobile/clock-sh73a0.c | 8 +-
964 arch/arm/mach-shmobile/include/mach/emev2.h | 5 -
965 arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 +
966 arch/arm/mach-shmobile/setup-emev2.c | 163 ++------------------
967 arch/arm/mach-shmobile/setup-r7s72100.c | 22 +++
968 arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +-
969 arch/arm/mach-shmobile/setup-r8a7791.c | 65 ++++++++
970 drivers/Makefile | 2 +-
971 drivers/irqchip/irq-renesas-intc-irqpin.c | 8 +-
972 drivers/usb/host/r8a66597-hcd.c | 4 +-
973 70 files changed, 1594 insertions(+), 625 deletions(-)
974 create mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
975 create mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
976 create mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c
977 create mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
978 delete mode 100644 arch/arm/mach-shmobile/board-kzm9d.c
979 Merging samsung/for-next (8465d57097ce Merge branch 'v3.14-next/samsung-defconfig' into for-next)
980 $ git merge samsung/for-next
981 Auto-merging arch/arm/boot/dts/cros5250-common.dtsi
982 Auto-merging arch/arm/Kconfig
983 Merge made by the 'recursive' strategy.
984 .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 +
985 arch/arm/Kconfig | 1 +
986 arch/arm/boot/dts/cros5250-common.dtsi | 8 +-
987 arch/arm/boot/dts/exynos5.dtsi | 21 -----
988 arch/arm/boot/dts/exynos5250-arndale.dts | 16 +---
989 arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 +---
990 arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
991 arch/arm/boot/dts/exynos5250.dtsi | 36 ++++++--
992 arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 ++++++++
993 arch/arm/boot/dts/exynos5420.dtsi | 96 +++++++++++++++++++++-
994 arch/arm/configs/exynos_defconfig | 2 +-
995 arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
996 arch/arm/plat-samsung/s5p-irq-eint.c | 4 +
997 drivers/clocksource/exynos_mct.c | 4 +
998 drivers/irqchip/exynos-combiner.c | 15 +---
999 15 files changed, 185 insertions(+), 73 deletions(-)
1000 Merging tegra/for-next (850500ad1edd Merge branch for-3.14/dt into for-next)
1001 $ git merge tegra/for-next
1002 Auto-merging arch/arm/mach-tegra/fuse.c
1003 Merge made by the 'recursive' strategy.
1004 arch/arm/include/debug/tegra.S | 34 +++++------------------------
1005 arch/arm/mach-tegra/fuse.c | 41 ++++++++++++++++++++++++++++++++++-
1006 arch/arm/mach-tegra/iomap.h | 14 ++++++------
1007 arch/arm/mach-tegra/tegra.c | 4 +---
1008 include/dt-bindings/gpio/tegra-gpio.h | 1 +
1009 5 files changed, 54 insertions(+), 40 deletions(-)
1010 Merging arm64/upstream (db4ed53cfe9f arm64: mm: Fix PMD_SECT_PROT_NONE definition)
1011 $ git merge arm64/upstream
1013 Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable)
1014 $ git merge blackfin/for-linus
1016 Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h)
1017 $ git merge c6x/for-linux-next
1018 Merge made by the 'recursive' strategy.
1019 arch/c6x/include/asm/cache.h | 1 +
1020 1 file changed, 1 insertion(+)
1021 Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
1022 $ git merge cris/for-next
1024 Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
1025 $ git merge hexagon/linux-next
1027 Merging ia64/next (959f58544b7f Linux 3.12-rc7)
1028 $ git merge ia64/next
1030 Merging m68k/for-next (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from rtc-cmos)
1031 $ git merge m68k/for-next
1032 Merge made by the 'recursive' strategy.
1033 Documentation/zorro.txt | 5 +-
1034 arch/m68k/Kconfig | 24 ++
1035 arch/m68k/amiga/chipram.c | 2 +-
1036 arch/m68k/amiga/config.c | 63 +++--
1037 arch/m68k/amiga/platform.c | 9 +-
1038 arch/m68k/apollo/config.c | 26 +-
1039 arch/m68k/atari/config.c | 10 +-
1040 arch/m68k/atari/debug.c | 5 +-
1041 arch/m68k/bvme6000/config.c | 6 +-
1042 arch/m68k/configs/amiga_defconfig | 6 +-
1043 arch/m68k/configs/apollo_defconfig | 6 +-
1044 arch/m68k/configs/atari_defconfig | 6 +-
1045 arch/m68k/configs/bvme6000_defconfig | 6 +-
1046 arch/m68k/configs/hp300_defconfig | 6 +-
1047 arch/m68k/configs/mac_defconfig | 6 +-
1048 arch/m68k/configs/multi_defconfig | 6 +-
1049 arch/m68k/configs/mvme147_defconfig | 6 +-
1050 arch/m68k/configs/mvme16x_defconfig | 6 +-
1051 arch/m68k/configs/q40_defconfig | 6 +-
1052 arch/m68k/configs/sun3_defconfig | 6 +-
1053 arch/m68k/configs/sun3x_defconfig | 6 +-
1054 arch/m68k/emu/natfeat.c | 3 +-
1055 arch/m68k/hp300/config.c | 10 +-
1056 arch/m68k/include/asm/amigahw.h | 28 +--
1057 arch/m68k/include/asm/apollohw.h | 11 +-
1058 arch/m68k/include/asm/atarihw.h | 2 +-
1059 arch/m68k/include/asm/bootinfo.h | 360 +--------------------------
1060 arch/m68k/include/asm/hp300hw.h | 20 +-
1061 arch/m68k/include/asm/kexec.h | 29 +++
1062 arch/m68k/include/asm/macintosh.h | 83 ++----
1063 arch/m68k/include/asm/mc146818rtc.h | 10 +-
1064 arch/m68k/include/asm/mvme16xhw.h | 17 --
1065 arch/m68k/include/asm/setup.h | 5 +-
1066 arch/m68k/include/asm/timex.h | 10 +
1067 arch/m68k/include/uapi/asm/Kbuild | 8 +
1068 arch/m68k/include/uapi/asm/bootinfo-amiga.h | 63 +++++
1069 arch/m68k/include/uapi/asm/bootinfo-apollo.h | 28 +++
1070 arch/m68k/include/uapi/asm/bootinfo-atari.h | 44 ++++
1071 arch/m68k/include/uapi/asm/bootinfo-hp300.h | 50 ++++
1072 arch/m68k/include/uapi/asm/bootinfo-mac.h | 119 +++++++++
1073 arch/m68k/include/uapi/asm/bootinfo-q40.h | 16 ++
1074 arch/m68k/include/uapi/asm/bootinfo-vme.h | 70 ++++++
1075 arch/m68k/include/uapi/asm/bootinfo.h | 174 +++++++++++++
1076 arch/m68k/include/uapi/asm/setup.h | 87 -------
1077 arch/m68k/kernel/Makefile | 3 +
1078 arch/m68k/kernel/asm-offsets.c | 3 +
1079 arch/m68k/kernel/bootinfo_proc.c | 80 ++++++
1080 arch/m68k/kernel/head.S | 12 +-
1081 arch/m68k/kernel/machine_kexec.c | 58 +++++
1082 arch/m68k/kernel/relocate_kernel.S | 159 ++++++++++++
1083 arch/m68k/kernel/setup_mm.c | 62 +++--
1084 arch/m68k/kernel/time.c | 4 +
1085 arch/m68k/mac/config.c | 34 +--
1086 arch/m68k/mac/iop.c | 5 +-
1087 arch/m68k/mac/misc.c | 2 -
1088 arch/m68k/mac/oss.c | 1 -
1089 arch/m68k/mac/psc.c | 3 +-
1090 arch/m68k/mac/via.c | 1 -
1091 arch/m68k/mm/init.c | 2 +-
1092 arch/m68k/mm/motorola.c | 2 +-
1093 arch/m68k/mvme147/config.c | 7 +-
1094 arch/m68k/mvme16x/config.c | 30 ++-
1095 arch/m68k/q40/config.c | 4 +-
1096 arch/m68k/sun3/dvma.c | 6 +-
1097 arch/m68k/sun3/mmu_emu.c | 3 +-
1098 arch/m68k/sun3/sun3dvma.c | 8 +-
1099 arch/m68k/sun3x/prom.c | 1 -
1100 drivers/block/z2ram.c | 7 +-
1101 drivers/ide/buddha.c | 2 +-
1102 drivers/macintosh/Kconfig | 2 +-
1103 drivers/net/ethernet/8390/hydra.c | 2 +-
1104 drivers/net/ethernet/8390/zorro8390.c | 4 +-
1105 drivers/net/ethernet/amd/a2065.c | 13 +-
1106 drivers/net/ethernet/amd/ariadne.c | 13 +-
1107 drivers/net/ethernet/natsemi/macsonic.c | 1 -
1108 drivers/parport/parport_mfc3.c | 2 +-
1109 drivers/scsi/a2091.c | 2 +-
1110 drivers/scsi/a3000.c | 2 +-
1111 drivers/scsi/a4000t.c | 2 +-
1112 drivers/scsi/gvp11.c | 2 +-
1113 drivers/scsi/zorro7xx.c | 2 +-
1114 drivers/video/amifb.c | 2 +-
1115 drivers/video/cirrusfb.c | 4 +-
1116 drivers/video/macfb.c | 1 -
1117 drivers/video/valkyriefb.c | 1 -
1118 drivers/zorro/Makefile | 3 +-
1119 drivers/zorro/names.c | 11 -
1120 drivers/zorro/proc.c | 10 +-
1121 drivers/zorro/zorro-driver.c | 11 +-
1122 drivers/zorro/zorro-sysfs.c | 22 +-
1123 drivers/zorro/zorro.c | 27 +-
1124 drivers/zorro/zorro.h | 5 +
1125 include/linux/zorro.h | 121 ++-------
1126 include/uapi/linux/Kbuild | 2 +
1127 include/uapi/linux/kexec.h | 1 +
1128 include/uapi/linux/zorro.h | 113 +++++++++
1129 include/{ => uapi}/linux/zorro_ids.h | 0
1130 97 files changed, 1412 insertions(+), 937 deletions(-)
1131 create mode 100644 arch/m68k/include/asm/kexec.h
1132 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-amiga.h
1133 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-apollo.h
1134 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-atari.h
1135 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-hp300.h
1136 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-mac.h
1137 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-q40.h
1138 create mode 100644 arch/m68k/include/uapi/asm/bootinfo-vme.h
1139 create mode 100644 arch/m68k/include/uapi/asm/bootinfo.h
1140 create mode 100644 arch/m68k/kernel/bootinfo_proc.c
1141 create mode 100644 arch/m68k/kernel/machine_kexec.c
1142 create mode 100644 arch/m68k/kernel/relocate_kernel.S
1143 create mode 100644 include/uapi/linux/zorro.h
1144 rename include/{ => uapi}/linux/zorro_ids.h (100%)
1145 Merging m68knommu/for-next (d4d80b54a862 m68k : Kill CONFIG_MTD_PARTITIONS)
1146 $ git merge m68knommu/for-next
1147 Merge made by the 'recursive' strategy.
1148 arch/m68k/configs/m5208evb_defconfig | 1 -
1149 arch/m68k/configs/m5249evb_defconfig | 1 -
1150 arch/m68k/configs/m5272c3_defconfig | 1 -
1151 arch/m68k/configs/m5275evb_defconfig | 1 -
1152 arch/m68k/configs/m5307c3_defconfig | 1 -
1153 arch/m68k/configs/m5407c3_defconfig | 1 -
1154 6 files changed, 6 deletions(-)
1155 Merging metag/for-next (1d61cf121d7d smp, metag: kill SMP single function call interrupt)
1156 $ git merge metag/for-next
1157 Merge made by the 'recursive' strategy.
1158 arch/metag/include/asm/smp.h | 2 --
1159 arch/metag/kernel/dma.c | 5 -----
1160 arch/metag/kernel/smp.c | 13 +++----------
1161 3 files changed, 3 insertions(+), 17 deletions(-)
1162 Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[])
1163 $ git merge microblaze/next
1164 Merge made by the 'recursive' strategy.
1165 arch/microblaze/Makefile | 2 ++
1166 arch/microblaze/include/asm/sections.h | 1 -
1167 arch/microblaze/kernel/setup.c | 5 ++---
1168 3 files changed, 4 insertions(+), 4 deletions(-)
1169 Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next)
1170 $ git merge mips/mips-for-linux-next
1171 Merge made by the 'recursive' strategy.
1172 arch/mips/lasat/picvue_proc.c | 4 ++--
1173 1 file changed, 2 insertions(+), 2 deletions(-)
1174 Merging openrisc/for-upstream (60a9dd5a10a1 openrisc: Use get_signal() signal_setup_done())
1175 $ git merge openrisc/for-upstream
1176 Merge made by the 'recursive' strategy.
1177 arch/openrisc/kernel/entry.S | 59 ++++++-----
1178 arch/openrisc/kernel/signal.c | 233 +++++++++++++++++++++---------------------
1179 2 files changed, 149 insertions(+), 143 deletions(-)
1180 Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
1181 $ git merge parisc/for-next
1183 Merging parisc-hd/for-next (dc1ccc48159d Linux 3.13-rc2)
1184 $ git merge parisc-hd/for-next
1186 Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors and plumb into memory poison infrastructure.)
1187 $ git merge powerpc/next
1188 Merge made by the 'recursive' strategy.
1189 arch/powerpc/Kconfig | 6 +
1190 arch/powerpc/boot/.gitignore | 1 +
1191 arch/powerpc/boot/dts/kilauea.dts | 2 +-
1192 arch/powerpc/boot/dts/virtex440-ml507.dts | 2 +
1193 arch/powerpc/include/asm/bitops.h | 5 +
1194 arch/powerpc/include/asm/cache.h | 14 +-
1195 arch/powerpc/include/asm/code-patching.h | 7 +
1196 arch/powerpc/include/asm/cputable.h | 12 +
1197 arch/powerpc/include/asm/exception-64s.h | 21 +-
1198 arch/powerpc/include/asm/hardirq.h | 3 +-
1199 arch/powerpc/include/asm/io.h | 16 +
1200 arch/powerpc/include/asm/iommu.h | 26 ++
1201 arch/powerpc/include/asm/lppaca.h | 2 -
1202 arch/powerpc/include/asm/mce.h | 198 ++++++++++++
1203 arch/powerpc/include/asm/opal.h | 98 +++++-
1204 arch/powerpc/include/asm/paca.h | 9 +
1205 arch/powerpc/include/asm/pgtable.h | 66 +++-
1206 arch/powerpc/include/asm/pte-hash64.h | 8 +-
1207 arch/powerpc/kernel/Makefile | 1 +
1208 arch/powerpc/kernel/asm-offsets.c | 4 +
1209 arch/powerpc/kernel/cpu_setup_power.S | 38 ++-
1210 arch/powerpc/kernel/cputable.c | 16 +
1211 arch/powerpc/kernel/eeh.c | 2 +-
1212 arch/powerpc/kernel/eeh_driver.c | 2 +-
1213 arch/powerpc/kernel/entry_64.S | 5 +
1214 arch/powerpc/kernel/exceptions-64s.S | 196 ++++++++++++
1215 arch/powerpc/kernel/idle_power7.S | 1 +
1216 arch/powerpc/kernel/iommu.c | 48 +--
1217 arch/powerpc/kernel/irq.c | 12 +-
1218 arch/powerpc/kernel/mce.c | 345 +++++++++++++++++++++
1219 arch/powerpc/kernel/mce_power.c | 284 +++++++++++++++++
1220 arch/powerpc/kernel/misc_32.S | 4 +-
1221 arch/powerpc/kernel/misc_64.S | 6 +
1222 arch/powerpc/kernel/paca.c | 32 +-
1223 arch/powerpc/kernel/setup_64.c | 16 +-
1224 arch/powerpc/kernel/smp.c | 9 +-
1225 arch/powerpc/kernel/sysfs.c | 72 +++--
1226 arch/powerpc/kernel/time.c | 3 +-
1227 arch/powerpc/kernel/traps.c | 15 +
1228 arch/powerpc/kvm/book3s_hv_ras.c | 50 ++-
1229 arch/powerpc/lib/code-patching.c | 15 +
1230 arch/powerpc/mm/hash_low_64.S | 15 +-
1231 arch/powerpc/mm/hash_utils_64.c | 7 +-
1232 arch/powerpc/mm/hugepage-hash64.c | 6 +-
1233 arch/powerpc/mm/hugetlbpage-hash64.c | 4 +
1234 arch/powerpc/mm/pgtable.c | 2 +-
1235 arch/powerpc/mm/pgtable_64.c | 2 +-
1236 arch/powerpc/mm/tlb_nohash.c | 19 --
1237 arch/powerpc/platforms/Kconfig.cputype | 1 +
1238 arch/powerpc/platforms/cell/beat_htab.c | 4 +-
1239 arch/powerpc/platforms/powernv/Kconfig | 5 -
1240 arch/powerpc/platforms/powernv/Makefile | 1 +
1241 arch/powerpc/platforms/powernv/eeh-ioda.c | 157 +---------
1242 arch/powerpc/platforms/powernv/opal-flash.c | 31 +-
1243 .../powerpc/platforms/powernv/opal-memory-errors.c | 146 +++++++++
1244 arch/powerpc/platforms/powernv/opal-rtc.c | 6 +-
1245 arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +
1246 arch/powerpc/platforms/powernv/opal.c | 251 ++++++++-------
1247 arch/powerpc/platforms/powernv/pci-ioda.c | 8 +-
1248 arch/powerpc/platforms/powernv/pci-p5ioc2.c | 2 +-
1249 arch/powerpc/platforms/powernv/pci.c | 229 ++++++++++----
1250 arch/powerpc/platforms/powernv/pci.h | 3 +
1251 arch/powerpc/platforms/ps3/spu.c | 2 +-
1252 arch/powerpc/platforms/pseries/Kconfig | 2 +-
1253 arch/powerpc/platforms/pseries/iommu.c | 8 +-
1254 arch/powerpc/platforms/pseries/lpar.c | 5 +-
1255 arch/powerpc/sysdev/Kconfig | 2 +-
1256 arch/powerpc/sysdev/fsl_pci.c | 2 +-
1257 arch/powerpc/xmon/xmon.c | 4 +
1258 drivers/macintosh/windfarm_lm75_sensor.c | 2 +-
1259 drivers/macintosh/windfarm_max6690_sensor.c | 2 +-
1260 include/linux/mm.h | 2 +-
1261 mm/mempolicy.c | 5 +-
1262 73 files changed, 2050 insertions(+), 559 deletions(-)
1263 create mode 100644 arch/powerpc/include/asm/mce.h
1264 create mode 100644 arch/powerpc/kernel/mce.c
1265 create mode 100644 arch/powerpc/kernel/mce_power.c
1266 create mode 100644 arch/powerpc/platforms/powernv/opal-memory-errors.c
1267 $ git am -3 ../patches/powerpc__Fix__attempt_to_move_.org_backwards__error.patch
1268 Applying: powerpc: Fix "attempt to move .org backwards" error
1270 Unstaged changes after reset:
1271 M arch/powerpc/kernel/exceptions-64s.S
1273 $ git commit -v -a --amend
1274 [master 428bb48d748d] Merge remote-tracking branch 'powerpc/next'
1275 Merging mpc5xxx/next (17a76e3ca7c9 clk: mpc512x: remove migration support workarounds)
1276 $ git merge mpc5xxx/next
1277 Auto-merging drivers/spi/spi-mpc512x-psc.c
1278 Removing arch/powerpc/platforms/512x/clock.c
1279 Removing arch/powerpc/kernel/clock.c
1280 Removing arch/powerpc/include/asm/clk_interface.h
1281 Auto-merging arch/powerpc/Kconfig
1282 Merge made by the 'recursive' strategy.
1283 arch/powerpc/Kconfig | 5 -
1284 arch/powerpc/boot/dts/ac14xx.dts | 7 +
1285 arch/powerpc/boot/dts/mpc5121.dtsi | 114 +++-
1286 arch/powerpc/include/asm/clk_interface.h | 20 -
1287 arch/powerpc/kernel/Makefile | 1 -
1288 arch/powerpc/kernel/clock.c | 82 ---
1289 arch/powerpc/platforms/512x/Kconfig | 2 +-
1290 arch/powerpc/platforms/512x/Makefile | 3 +-
1291 arch/powerpc/platforms/512x/clock-commonclk.c | 950 ++++++++++++++++++++++++++
1292 arch/powerpc/platforms/512x/clock.c | 754 --------------------
1293 arch/powerpc/platforms/512x/mpc512x_shared.c | 169 ++---
1294 arch/powerpc/platforms/52xx/Kconfig | 2 +-
1295 drivers/media/platform/fsl-viu.c | 2 +-
1296 drivers/mtd/nand/mpc5121_nfc.c | 2 +-
1297 drivers/net/can/mscan/mpc5xxx_can.c | 270 ++++----
1298 drivers/spi/spi-mpc512x-psc.c | 26 +-
1299 drivers/tty/serial/mpc52xx_uart.c | 90 ++-
1300 drivers/usb/host/fsl-mph-dr-of.c | 13 +-
1301 include/dt-bindings/clock/mpc512x-clock.h | 69 ++
1302 include/linux/clk-provider.h | 16 +
1303 20 files changed, 1504 insertions(+), 1093 deletions(-)
1304 delete mode 100644 arch/powerpc/include/asm/clk_interface.h
1305 delete mode 100644 arch/powerpc/kernel/clock.c
1306 create mode 100644 arch/powerpc/platforms/512x/clock-commonclk.c
1307 delete mode 100644 arch/powerpc/platforms/512x/clock.c
1308 create mode 100644 include/dt-bindings/clock/mpc512x-clock.h
1309 Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
1310 $ git merge galak/next
1312 Merging s390/features (c9b851905dba s390/blacklist: Perform subchannel scan only when needed)
1313 $ git merge s390/features
1314 Merge made by the 'recursive' strategy.
1315 Documentation/kmsg/s390/zcrypt | 20 +++
1316 arch/s390/Kconfig | 6 +-
1317 arch/s390/include/asm/sclp.h | 3 +-
1318 arch/s390/include/uapi/asm/zcrypt.h | 44 ++++++
1319 arch/s390/kernel/asm-offsets.c | 1 +
1320 arch/s390/kernel/vdso.c | 2 +-
1321 arch/s390/kernel/vdso32/clock_gettime.S | 9 +-
1322 arch/s390/kernel/vdso64/clock_getres.S | 4 +-
1323 arch/s390/kernel/vdso64/clock_gettime.S | 10 +-
1324 drivers/s390/block/dasd_genhd.c | 1 -
1325 drivers/s390/char/sclp_early.c | 5 +-
1326 drivers/s390/cio/blacklist.c | 6 +-
1327 drivers/s390/cio/chsc.c | 40 +----
1328 drivers/s390/cio/css.c | 26 +++-
1329 drivers/s390/cio/css.h | 1 +
1330 drivers/s390/crypto/ap_bus.c | 31 +++-
1331 drivers/s390/crypto/ap_bus.h | 4 +-
1332 drivers/s390/crypto/zcrypt_api.c | 101 ++++++++++++-
1333 drivers/s390/crypto/zcrypt_api.h | 2 +
1334 drivers/s390/crypto/zcrypt_cex4.c | 20 ++-
1335 drivers/s390/crypto/zcrypt_error.h | 18 ++-
1336 drivers/s390/crypto/zcrypt_msgtype50.c | 12 ++
1337 drivers/s390/crypto/zcrypt_msgtype6.c | 256 ++++++++++++++++++++++++++++++++
1338 drivers/s390/crypto/zcrypt_msgtype6.h | 2 +
1339 drivers/s390/crypto/zcrypt_pcica.c | 11 ++
1340 drivers/s390/crypto/zcrypt_pcicc.c | 12 ++
1341 26 files changed, 565 insertions(+), 82 deletions(-)
1342 create mode 100644 Documentation/kmsg/s390/zcrypt
1343 Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
1344 $ git merge sh/sh-latest
1345 Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution.
1346 Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
1347 Resolved 'include/linux/serial_sci.h' using previous resolution.
1348 Auto-merging include/linux/serial_sci.h
1349 CONFLICT (content): Merge conflict in include/linux/serial_sci.h
1350 Auto-merging drivers/tty/serial/sh-sci.c
1351 CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
1352 Auto-merging arch/sh/kernel/cpu/sh2a/Makefile
1353 CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
1354 Automatic merge failed; fix conflicts and then commit the result.
1356 [master 5d958f55c3ae] Merge remote-tracking branch 'sh/sh-latest'
1357 $ git diff -M --stat --summary HEAD^..
1358 .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++
1359 arch/sh/include/asm/hw_breakpoint.h | 12 +-
1360 arch/sh/include/cpu-common/cpu/ubc.h | 17 +++
1361 arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++
1362 arch/sh/kernel/cpu/sh2a/Makefile | 1 +
1363 arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++
1364 arch/sh/kernel/hw_breakpoint.c | 8 ++
1365 drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++-
1366 include/linux/serial_sci.h | 4 +
1367 9 files changed, 375 insertions(+), 15 deletions(-)
1368 create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt
1369 create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h
1370 create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h
1371 create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c
1372 Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
1373 $ git merge sparc-next/master
1375 Merging tile/master (5e01dc7b26d9 Linux 3.12)
1376 $ git merge tile/master
1378 Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
1379 $ git merge unicore32/unicore32
1381 Merging xtensa/for_next (3bf4c10bb2e3 xtensa: implement CPU hotplug)
1382 $ git merge xtensa/for_next
1383 Auto-merging drivers/irqchip/Makefile
1384 Merge made by the 'recursive' strategy.
1385 arch/xtensa/Kconfig | 47 +-
1386 arch/xtensa/boot/dts/xtfpga.dtsi | 2 +-
1387 arch/xtensa/include/asm/Kbuild | 1 -
1388 arch/xtensa/include/asm/barrier.h | 4 +-
1389 arch/xtensa/include/asm/bitops.h | 8 +-
1390 arch/xtensa/include/asm/cacheflush.h | 40 +-
1391 arch/xtensa/include/asm/delay.h | 9 +-
1392 arch/xtensa/include/asm/ftrace.h | 2 +-
1393 arch/xtensa/include/asm/futex.h | 147 +++++
1394 arch/xtensa/include/asm/irq.h | 9 +
1395 arch/xtensa/include/asm/mmu.h | 10 +-
1396 arch/xtensa/include/asm/mmu_context.h | 106 ++--
1397 arch/xtensa/include/asm/mxregs.h | 46 ++
1398 arch/xtensa/include/asm/processor.h | 20 +
1399 arch/xtensa/include/asm/ptrace.h | 8 +
1400 arch/xtensa/include/asm/smp.h | 38 +-
1401 arch/xtensa/include/asm/spinlock.h | 31 +-
1402 arch/xtensa/include/asm/spinlock_types.h | 20 +
1403 arch/xtensa/include/asm/timex.h | 14 +-
1404 arch/xtensa/include/asm/tlbflush.h | 42 +-
1405 arch/xtensa/include/asm/traps.h | 1 +
1406 arch/xtensa/include/asm/vectors.h | 12 +-
1407 arch/xtensa/kernel/Makefile | 1 +
1408 arch/xtensa/kernel/head.S | 181 +++++--
1409 arch/xtensa/kernel/irq.c | 207 ++++----
1410 arch/xtensa/kernel/mxhead.S | 85 +++
1411 arch/xtensa/kernel/setup.c | 92 ++--
1412 arch/xtensa/kernel/smp.c | 591 +++++++++++++++++++++
1413 arch/xtensa/kernel/time.c | 56 +-
1414 arch/xtensa/kernel/traps.c | 56 +-
1415 arch/xtensa/kernel/vmlinux.lds.S | 26 +
1416 arch/xtensa/mm/cache.c | 7 +-
1417 arch/xtensa/mm/fault.c | 2 +-
1418 arch/xtensa/mm/misc.S | 4 +-
1419 arch/xtensa/mm/mmu.c | 4 +-
1420 arch/xtensa/mm/tlb.c | 37 +-
1421 arch/xtensa/platforms/iss/network.c | 290 ++++------
1422 .../platforms/xtfpga/include/platform/hardware.h | 6 +-
1423 arch/xtensa/variants/s6000/include/variant/irq.h | 1 -
1424 drivers/irqchip/Kconfig | 4 +
1425 drivers/irqchip/Makefile | 2 +
1426 drivers/irqchip/irq-xtensa-mx.c | 164 ++++++
1427 drivers/irqchip/irq-xtensa-pic.c | 108 ++++
1428 include/linux/irqchip/xtensa-mx.h | 17 +
1429 include/linux/irqchip/xtensa-pic.h | 18 +
1430 45 files changed, 1987 insertions(+), 589 deletions(-)
1431 create mode 100644 arch/xtensa/include/asm/futex.h
1432 create mode 100644 arch/xtensa/include/asm/mxregs.h
1433 create mode 100644 arch/xtensa/include/asm/spinlock_types.h
1434 create mode 100644 arch/xtensa/kernel/mxhead.S
1435 create mode 100644 arch/xtensa/kernel/smp.c
1436 create mode 100644 drivers/irqchip/irq-xtensa-mx.c
1437 create mode 100644 drivers/irqchip/irq-xtensa-pic.c
1438 create mode 100644 include/linux/irqchip/xtensa-mx.h
1439 create mode 100644 include/linux/irqchip/xtensa-pic.h
1440 Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes)
1441 $ git merge btrfs/next
1443 Merging ceph/master (9fb9d5b2ace4 ceph: implement readv/preadv for sync operation)
1444 $ git merge ceph/master
1445 Merge made by the 'recursive' strategy.
1446 fs/ceph/file.c | 435 ++++++++++++++++++++++++++++++++++++++++----------------
1447 fs/ceph/inode.c | 10 ++
1448 fs/ceph/super.c | 1 +
1449 fs/ceph/super.h | 1 +
1450 4 files changed, 321 insertions(+), 126 deletions(-)
1451 Merging cifs/for-next (7f07d4db6ad9 cifs: We do not drop reference to tlink in CIFSCheckMFSymlink())
1452 $ git merge cifs/for-next
1453 Merge made by the 'recursive' strategy.
1454 fs/cifs/cifsproto.h | 7 ++++---
1455 fs/cifs/cifssmb.c | 6 +++---
1456 fs/cifs/inode.c | 6 ++++--
1457 fs/cifs/link.c | 26 +++++++++++---------------
1458 4 files changed, 22 insertions(+), 23 deletions(-)
1459 Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
1460 $ git merge configfs/linux-next
1462 Merging ecryptfs/next (2000f5beabc9 eCryptfs: file->private_data is always valid)
1463 $ git merge ecryptfs/next
1465 Merging ext3/for_next (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write())
1466 $ git merge ext3/for_next
1467 Merge made by the 'recursive' strategy.
1468 fs/ext2/super.c | 1 +
1469 1 file changed, 1 insertion(+)
1470 Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc)
1471 $ git merge ext4/dev
1472 Merge made by the 'recursive' strategy.
1473 fs/ext4/ext4_jbd2.c | 9 +++++++++
1474 fs/ext4/extents.c | 19 ++++++++++++++++++-
1475 fs/ext4/inode.c | 5 -----
1476 fs/ext4/mballoc.c | 11 ++++++++---
1477 fs/ext4/super.c | 21 +++++++++++++++------
1478 fs/jbd2/journal.c | 18 ++++++++----------
1479 fs/jbd2/recovery.c | 2 +-
1480 fs/jbd2/transaction.c | 16 +++++++++-------
1481 8 files changed, 68 insertions(+), 33 deletions(-)
1482 Merging f2fs/dev (0491fe20cb11 f2fs: replace the debugfs_root with f2fs_debugfs_root)
1483 $ git merge f2fs/dev
1484 Merge made by the 'recursive' strategy.
1485 fs/f2fs/checkpoint.c | 83 +++----
1486 fs/f2fs/data.c | 347 +++++++++++++++++++++--------
1487 fs/f2fs/debug.c | 32 ++-
1488 fs/f2fs/f2fs.h | 104 ++++++---
1489 fs/f2fs/file.c | 48 +---
1491 fs/f2fs/node.c | 128 ++++++-----
1492 fs/f2fs/recovery.c | 4 +-
1493 fs/f2fs/segment.c | 524 ++++++++++++++++++++++++++++----------------
1494 fs/f2fs/segment.h | 22 +-
1495 fs/f2fs/super.c | 32 ++-
1496 include/linux/f2fs_fs.h | 8 +
1497 include/trace/events/f2fs.h | 107 ++++++---
1498 13 files changed, 943 insertions(+), 500 deletions(-)
1499 Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF)
1500 $ git merge fscache/fscache
1501 Merge made by the 'recursive' strategy.
1502 fs/fscache/page.c | 37 ++++++++++++++++++++++++++++++++++++-
1503 1 file changed, 36 insertions(+), 1 deletion(-)
1504 Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
1505 $ git merge fuse/for-next
1507 Merging gfs2/master (3ecb91bd8fac GFS2: Use only a single address space for rgrps)
1508 $ git merge gfs2/master
1509 Merge made by the 'recursive' strategy.
1510 fs/gfs2/aops.c | 18 +++------
1511 fs/gfs2/glops.c | 20 +++++-----
1512 fs/gfs2/incore.h | 13 ++++++-
1513 fs/gfs2/lops.c | 5 +++
1514 fs/gfs2/meta_io.c | 3 ++
1515 fs/gfs2/ops_fstype.c | 24 +++++++++++-
1516 fs/gfs2/quota.c | 37 ++++++------------
1517 fs/gfs2/rgrp.c | 106 +++++++++++++++++++++++++++++++++++++++------------
1518 8 files changed, 153 insertions(+), 73 deletions(-)
1519 Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
1520 $ git merge jfs/jfs-next
1522 Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
1523 $ git merge logfs/master
1524 Auto-merging fs/logfs/super.c
1525 Merge made by the 'recursive' strategy.
1526 fs/logfs/dev_mtd.c | 2 +-
1527 fs/logfs/super.c | 6 +++---
1528 2 files changed, 4 insertions(+), 4 deletions(-)
1529 Merging nfs/linux-next (e2f0c83a9de3 sunrpc: add an "info" file for the dummy gssd pipe)
1530 $ git merge nfs/linux-next
1531 Merge made by the 'recursive' strategy.
1532 fs/nfs/nfs4client.c | 7 +-
1533 fs/nfs/nfs4xdr.c | 47 +++++++----
1534 include/linux/sunrpc/rpc_pipe_fs.h | 5 +-
1535 net/sunrpc/auth_gss/auth_gss.c | 17 ++--
1536 net/sunrpc/netns.h | 3 +-
1537 net/sunrpc/rpc_pipe.c | 157 +++++++++++++++++++++++++++++++++++--
1538 net/sunrpc/sunrpc_syms.c | 8 +-
1539 7 files changed, 206 insertions(+), 38 deletions(-)
1540 Merging nfsd/nfsd-next (d2c2ad54c485 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
1541 $ git merge nfsd/nfsd-next
1543 Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
1544 $ git merge omfs/for-next
1546 Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
1547 $ git merge squashfs/master
1549 Merging v9fs/for-next (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead)
1550 $ git merge v9fs/for-next
1551 Merge made by the 'recursive' strategy.
1552 fs/9p/cache.c | 3 +--
1553 fs/9p/vfs_file.c | 2 --
1554 fs/9p/vfs_inode.c | 4 +---
1555 fs/9p/vfs_inode_dotl.c | 8 --------
1556 fs/9p/xattr.c | 10 ++++++----
1557 net/9p/client.c | 3 ---
1558 net/9p/trans_fd.c | 2 +-
1559 net/9p/trans_virtio.c | 2 +-
1560 8 files changed, 10 insertions(+), 24 deletions(-)
1561 Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
1562 $ git merge ubifs/linux-next
1564 Merging xfs/for-next (c91c46c12768 xfs: add xfs_setattr_time)
1565 $ git merge xfs/for-next
1566 Removing fs/xfs/xfs_quota_priv.h
1567 Auto-merging fs/ext4/inode.c
1568 Merge made by the 'recursive' strategy.
1570 fs/btrfs/inode.c | 8 +++--
1571 fs/ext4/inode.c | 4 +++
1572 fs/xfs/xfs_buf.c | 26 +++++------------
1573 fs/xfs/xfs_dir2_node.c | 26 ++++++++---------
1574 fs/xfs/xfs_discard.c | 5 ++--
1575 fs/xfs/xfs_fsops.c | 6 +++-
1576 fs/xfs/xfs_ioctl.c | 3 +-
1577 fs/xfs/xfs_ioctl32.c | 3 +-
1578 fs/xfs/xfs_iops.c | 76 ++++++++++++++++++++++--------------------------
1579 fs/xfs/xfs_log_recover.c | 17 +++++++++--
1580 fs/xfs/xfs_qm.c | 9 ++----
1581 fs/xfs/xfs_qm.h | 18 +++++++++++-
1582 fs/xfs/xfs_qm_syscalls.c | 18 ++++++++----
1583 fs/xfs/xfs_quota_priv.h | 42 --------------------------
1584 fs/xfs/xfs_trans_dquot.c | 4 +--
1585 fs/xfs/xfs_vnode.h | 9 ------
1586 17 files changed, 125 insertions(+), 154 deletions(-)
1587 delete mode 100644 fs/xfs/xfs_quota_priv.h
1588 Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification)
1589 $ git merge vfs/for-next
1591 Merging pci/next (6ce4eac1f600 Linux 3.13-rc1)
1592 $ git merge pci/next
1594 Merging hid/for-next (074fb898390b Merge branch 'for-3.14/upstream' into for-next)
1595 $ git merge hid/for-next
1596 Auto-merging drivers/hid/i2c-hid/i2c-hid.c
1597 Auto-merging drivers/hid/hid-multitouch.c
1598 Auto-merging drivers/hid/hid-ids.h
1599 Auto-merging drivers/hid/hid-core.c
1600 Auto-merging drivers/hid/Kconfig
1601 Merge made by the 'recursive' strategy.
1602 drivers/hid/Kconfig | 1 +
1603 drivers/hid/hid-core.c | 4 +-
1604 drivers/hid/hid-ids.h | 8 +-
1605 drivers/hid/hid-lg.c | 2 +
1606 drivers/hid/hid-multitouch.c | 4 +-
1607 drivers/hid/hid-sony.c | 194 ++++++++++++++++++++--------------------
1608 drivers/hid/i2c-hid/i2c-hid.c | 2 +
1609 drivers/hid/usbhid/hid-quirks.c | 8 +-
1610 drivers/hid/usbhid/usbkbd.c | 2 +-
1611 9 files changed, 117 insertions(+), 108 deletions(-)
1612 Merging i2c/i2c/for-next (af91706d5dde ima: store address of template_fmt_copy in a pointer before calling strsep)
1613 $ git merge i2c/i2c/for-next
1615 Merging jdelvare-hwmon/master (024cd034d0e6 hwmon: (it87) Print proper names for the IT8771E and IT8772E)
1616 $ git merge jdelvare-hwmon/master
1617 Merge made by the 'recursive' strategy.
1618 Documentation/hwmon/it87 | 27 ++++++++----
1619 drivers/hwmon/Kconfig | 4 +-
1620 drivers/hwmon/it87.c | 104 ++++++++++++++++++++++++++++++++++++++--------
1621 drivers/hwmon/lm78.c | 2 +
1622 drivers/hwmon/lm90.c | 4 +-
1623 drivers/hwmon/sis5595.c | 2 +
1624 drivers/hwmon/vt8231.c | 2 +-
1625 drivers/hwmon/w83l786ng.c | 10 +++--
1626 8 files changed, 121 insertions(+), 34 deletions(-)
1627 Merging hwmon-staging/hwmon-next (7f438058ec86 hwmon: remove DEFINE_PCI_DEVICE_TABLE macro)
1628 $ git merge hwmon-staging/hwmon-next
1629 Auto-merging drivers/hwmon/vt8231.c
1630 Auto-merging drivers/hwmon/sis5595.c
1631 Merge made by the 'recursive' strategy.
1632 drivers/hwmon/fam15h_power.c | 2 +-
1633 drivers/hwmon/k10temp.c | 2 +-
1634 drivers/hwmon/k8temp.c | 2 +-
1635 drivers/hwmon/sis5595.c | 2 +-
1636 drivers/hwmon/via686a.c | 2 +-
1637 drivers/hwmon/vt8231.c | 2 +-
1638 6 files changed, 6 insertions(+), 6 deletions(-)
1639 Merging v4l-dvb/master (9c3d6c25d373 Merge branch 'v4l_for_linus' into to_next)
1640 $ git merge v4l-dvb/master
1641 Merge made by the 'recursive' strategy.
1642 .../DocBook/media/v4l/media-ioc-enum-links.xml | 9 +
1643 Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 8 +-
1644 Documentation/video4linux/omap4_camera.txt | 60 +
1645 drivers/media/common/siano/smscoreapi.h | 4 +-
1646 drivers/media/common/siano/smsdvb.h | 2 +-
1647 drivers/media/dvb-core/dvb_demux.c | 9 +-
1648 drivers/media/dvb-frontends/af9033.c | 12 +-
1649 drivers/media/dvb-frontends/cxd2820r_c.c | 2 +-
1650 drivers/media/dvb-frontends/dib8000.c | 4 +-
1651 drivers/media/dvb-frontends/drxk_hard.c | 18 +-
1652 drivers/media/dvb-frontends/rtl2830.c | 1 +
1653 drivers/media/i2c/adv7183_regs.h | 6 +-
1654 drivers/media/i2c/adv7604.c | 2 +-
1655 drivers/media/i2c/adv7842.c | 2 +-
1656 drivers/media/i2c/ir-kbd-i2c.c | 2 +-
1657 drivers/media/i2c/m5mols/m5mols_controls.c | 2 +-
1658 drivers/media/i2c/mt9p031.c | 1 +
1659 drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
1660 drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +-
1661 drivers/media/i2c/saa7115.c | 2 +-
1662 drivers/media/i2c/soc_camera/ov5642.c | 2 +-
1663 drivers/media/i2c/ths7303.c | 3 +-
1664 drivers/media/i2c/wm8775.c | 4 +-
1665 drivers/media/media-entity.c | 41 +-
1666 drivers/media/pci/bt8xx/bttv-driver.c | 3 +-
1667 drivers/media/pci/cx18/cx18-driver.h | 2 +-
1668 drivers/media/pci/cx23885/cx23885-417.c | 2 +-
1669 drivers/media/pci/pluto2/pluto2.c | 2 +-
1670 drivers/media/pci/saa7164/saa7164-core.c | 4 +-
1671 drivers/media/platform/coda.c | 2 +-
1672 drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
1673 drivers/media/platform/exynos4-is/fimc-core.h | 2 -
1674 drivers/media/platform/exynos4-is/fimc-is-regs.c | 36 +-
1675 drivers/media/platform/exynos4-is/fimc-is-regs.h | 1 -
1676 drivers/media/platform/exynos4-is/fimc-lite-reg.c | 4 +-
1677 drivers/media/platform/exynos4-is/fimc-m2m.c | 148 +-
1678 drivers/media/platform/exynos4-is/media-dev.c | 2 +-
1679 drivers/media/platform/exynos4-is/mipi-csis.c | 2 +-
1680 drivers/media/platform/marvell-ccic/mmp-driver.c | 45 +-
1681 drivers/media/platform/mem2mem_testdev.c | 152 +-
1682 drivers/media/platform/omap3isp/isp.c | 2 +-
1683 drivers/media/platform/omap3isp/ispccdc.c | 3 +-
1684 drivers/media/platform/omap3isp/ispccp2.c | 3 +-
1685 drivers/media/platform/omap3isp/ispcsi2.c | 3 +-
1686 drivers/media/platform/omap3isp/isppreview.c | 3 +-
1687 drivers/media/platform/omap3isp/ispresizer.c | 18 +-
1688 drivers/media/platform/omap3isp/ispstat.c | 2 +-
1689 drivers/media/platform/omap3isp/ispvideo.c | 67 +-
1690 drivers/media/platform/s5p-g2d/g2d.c | 124 +-
1691 drivers/media/platform/s5p-g2d/g2d.h | 1 -
1692 drivers/media/platform/s5p-jpeg/jpeg-core.c | 134 +-
1693 drivers/media/platform/s5p-jpeg/jpeg-core.h | 2 -
1694 drivers/media/platform/s5p-mfc/regs-mfc.h | 2 +-
1695 drivers/media/platform/s5p-mfc/s5p_mfc.c | 12 +-
1696 drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
1697 drivers/media/platform/s5p-tv/mixer.h | 2 +-
1698 drivers/media/platform/s5p-tv/mixer_drv.c | 34 +-
1699 drivers/media/platform/s5p-tv/mixer_video.c | 4 +-
1700 drivers/media/platform/s5p-tv/sdo_drv.c | 39 +-
1701 drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
1702 drivers/media/platform/vivi.c | 4 +-
1703 drivers/media/platform/vsp1/vsp1_drv.c | 2 +-
1704 drivers/media/platform/vsp1/vsp1_video.c | 4 +-
1705 drivers/media/radio/radio-shark.c | 4 +-
1706 drivers/media/radio/radio-shark2.c | 4 +-
1707 drivers/media/radio/radio-si476x.c | 4 +-
1708 drivers/media/radio/radio-tea5764.c | 2 +-
1709 drivers/media/radio/tef6862.c | 2 +-
1710 drivers/media/rc/imon.c | 2 +-
1711 drivers/media/rc/redrat3.c | 2 +-
1712 drivers/media/tuners/mt2063.c | 4 +-
1713 drivers/media/tuners/tuner-xc2028-types.h | 2 +-
1714 drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
1715 drivers/media/usb/dvb-usb-v2/af9035.c | 17 +-
1716 drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +-
1717 drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
1718 drivers/media/usb/em28xx/em28xx-video.c | 2 +-
1719 drivers/media/usb/gspca/gl860/gl860.c | 2 +-
1720 drivers/media/usb/gspca/pac207.c | 2 +-
1721 drivers/media/usb/gspca/pac7302.c | 2 +-
1722 drivers/media/usb/gspca/stk1135.c | 3 +
1723 drivers/media/usb/gspca/stv0680.c | 2 +-
1724 drivers/media/usb/gspca/sunplus.c | 1 +
1725 drivers/media/usb/gspca/zc3xx.c | 2 +-
1726 drivers/media/usb/pwc/pwc-if.c | 2 +-
1727 drivers/media/usb/usbtv/usbtv.c | 174 ++-
1728 drivers/media/usb/uvc/uvc_video.c | 2 +-
1729 drivers/media/v4l2-core/v4l2-ctrls.c | 2 +-
1730 drivers/media/v4l2-core/v4l2-mem2mem.c | 126 ++
1731 drivers/media/v4l2-core/videobuf2-core.c | 8 +-
1732 drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +-
1733 drivers/staging/media/Kconfig | 2 +
1734 drivers/staging/media/Makefile | 1 +
1735 drivers/staging/media/omap4iss/Kconfig | 12 +
1736 drivers/staging/media/omap4iss/Makefile | 6 +
1737 drivers/staging/media/omap4iss/TODO | 4 +
1738 drivers/staging/media/omap4iss/iss.c | 1462 ++++++++++++++++++++
1739 drivers/staging/media/omap4iss/iss.h | 153 ++
1740 drivers/staging/media/omap4iss/iss_csi2.c | 1368 ++++++++++++++++++
1741 drivers/staging/media/omap4iss/iss_csi2.h | 156 +++
1742 drivers/staging/media/omap4iss/iss_csiphy.c | 278 ++++
1743 drivers/staging/media/omap4iss/iss_csiphy.h | 51 +
1744 drivers/staging/media/omap4iss/iss_ipipe.c | 581 ++++++++
1745 drivers/staging/media/omap4iss/iss_ipipe.h | 67 +
1746 drivers/staging/media/omap4iss/iss_ipipeif.c | 847 ++++++++++++
1747 drivers/staging/media/omap4iss/iss_ipipeif.h | 92 ++
1748 drivers/staging/media/omap4iss/iss_regs.h | 883 ++++++++++++
1749 drivers/staging/media/omap4iss/iss_resizer.c | 905 ++++++++++++
1750 drivers/staging/media/omap4iss/iss_resizer.h | 75 +
1751 drivers/staging/media/omap4iss/iss_video.c | 1128 +++++++++++++++
1752 drivers/staging/media/omap4iss/iss_video.h | 198 +++
1753 include/media/omap4iss.h | 65 +
1754 include/media/v4l2-fh.h | 4 +
1755 include/media/v4l2-mem2mem.h | 24 +
1756 include/media/videobuf2-core.h | 2 +-
1757 include/uapi/linux/media.h | 1 +
1758 116 files changed, 9060 insertions(+), 768 deletions(-)
1759 create mode 100644 Documentation/video4linux/omap4_camera.txt
1760 create mode 100644 drivers/staging/media/omap4iss/Kconfig
1761 create mode 100644 drivers/staging/media/omap4iss/Makefile
1762 create mode 100644 drivers/staging/media/omap4iss/TODO
1763 create mode 100644 drivers/staging/media/omap4iss/iss.c
1764 create mode 100644 drivers/staging/media/omap4iss/iss.h
1765 create mode 100644 drivers/staging/media/omap4iss/iss_csi2.c
1766 create mode 100644 drivers/staging/media/omap4iss/iss_csi2.h
1767 create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.c
1768 create mode 100644 drivers/staging/media/omap4iss/iss_csiphy.h
1769 create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.c
1770 create mode 100644 drivers/staging/media/omap4iss/iss_ipipe.h
1771 create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.c
1772 create mode 100644 drivers/staging/media/omap4iss/iss_ipipeif.h
1773 create mode 100644 drivers/staging/media/omap4iss/iss_regs.h
1774 create mode 100644 drivers/staging/media/omap4iss/iss_resizer.c
1775 create mode 100644 drivers/staging/media/omap4iss/iss_resizer.h
1776 create mode 100644 drivers/staging/media/omap4iss/iss_video.c
1777 create mode 100644 drivers/staging/media/omap4iss/iss_video.h
1778 create mode 100644 include/media/omap4iss.h
1779 Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next)
1780 $ git merge kbuild/for-next
1781 Merge made by the 'recursive' strategy.
1782 scripts/package/builddeb | 12 +++++++++++-
1783 1 file changed, 11 insertions(+), 1 deletion(-)
1784 Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
1785 $ git merge kconfig/for-next
1787 Merging libata/for-next (c5fd0781fbae Merge branch 'for-3.14' into for-next)
1788 $ git merge libata/for-next
1789 Merge made by the 'recursive' strategy.
1790 .../devicetree/bindings/ata/sata_rcar.txt | 18 ++
1791 drivers/ata/ahci.c | 60 +++++-
1792 drivers/ata/ahci_imx.c | 240 +++++++++++++--------
1793 drivers/ata/ata_generic.c | 7 -
1794 drivers/ata/libata-core.c | 3 +
1795 drivers/ata/libata-eh.c | 5 +-
1796 drivers/ata/sata_rcar.c | 118 ++++++++--
1797 7 files changed, 332 insertions(+), 119 deletions(-)
1798 create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt
1799 Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
1800 $ git merge pstore/master
1802 Merging pm/linux-next (efef6dba5277 Merge branch 'master' into linux-next)
1803 $ git merge pm/linux-next
1804 Merge made by the 'recursive' strategy.
1805 Documentation/acpi/namespace.txt | 9 +-
1806 arch/ia64/hp/common/aml_nfw.c | 3 +-
1807 arch/x86/kernel/apic/apic_flat_64.c | 4 +-
1808 arch/x86/kernel/apic/io_apic.c | 3 -
1809 arch/x86/pci/mmconfig_32.c | 1 -
1810 arch/x86/platform/olpc/olpc-xo15-sci.c | 3 +-
1811 drivers/acpi/ac.c | 3 +-
1812 drivers/acpi/acpi_extlog.c | 1 -
1813 drivers/acpi/acpi_lpss.c | 1 +
1814 drivers/acpi/acpi_memhotplug.c | 15 +-
1815 drivers/acpi/acpi_pad.c | 3 +-
1816 drivers/acpi/acpi_processor.c | 2 +-
1817 drivers/acpi/apei/einj.c | 1 -
1818 drivers/acpi/battery.c | 3 +-
1819 drivers/acpi/blacklist.c | 1 -
1820 drivers/acpi/bus.c | 77 +---
1821 drivers/acpi/button.c | 3 +-
1822 drivers/acpi/container.c | 11 +-
1823 drivers/acpi/custom_method.c | 2 +-
1824 drivers/acpi/debugfs.c | 2 +-
1825 drivers/acpi/device_pm.c | 22 +-
1826 drivers/acpi/dock.c | 11 +-
1827 drivers/acpi/ec.c | 5 +-
1828 drivers/acpi/event.c | 2 +-
1829 drivers/acpi/fan.c | 3 +-
1830 drivers/acpi/glue.c | 165 +++----
1831 drivers/acpi/hed.c | 2 -
1832 drivers/acpi/internal.h | 9 +-
1833 drivers/acpi/numa.c | 1 -
1834 drivers/acpi/osl.c | 9 +-
1835 drivers/acpi/pci_irq.c | 2 -
1836 drivers/acpi/pci_link.c | 4 +-
1837 drivers/acpi/pci_root.c | 126 +-----
1838 drivers/acpi/power.c | 3 +-
1839 drivers/acpi/proc.c | 4 +-
1840 drivers/acpi/processor_core.c | 3 +-
1841 drivers/acpi/processor_idle.c | 4 +-
1842 drivers/acpi/processor_perflib.c | 7 +-
1843 drivers/acpi/processor_thermal.c | 7 +-
1844 drivers/acpi/processor_throttling.c | 7 +-
1845 drivers/acpi/sbshc.c | 3 +-
1846 drivers/acpi/scan.c | 482 +++++++++++----------
1847 drivers/acpi/sleep.c | 4 -
1848 drivers/acpi/sysfs.c | 2 +-
1849 drivers/acpi/thermal.c | 5 +-
1850 drivers/acpi/utils.c | 2 -
1851 drivers/acpi/video.c | 5 +-
1852 drivers/acpi/wakeup.c | 1 -
1853 drivers/ata/libata-acpi.c | 28 +-
1854 drivers/ata/pata_acpi.c | 5 +-
1855 drivers/char/hpet.c | 7 +-
1856 drivers/char/tpm/tpm_acpi.c | 2 +-
1857 drivers/char/tpm/tpm_ppi.c | 1 -
1858 drivers/cpufreq/cpufreq-cpu0.c | 2 +-
1859 drivers/cpufreq/spear-cpufreq.c | 2 +-
1860 drivers/gpu/drm/i915/intel_acpi.c | 2 -
1861 drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-
1862 drivers/gpu/drm/radeon/radeon_acpi.c | 6 +-
1863 drivers/hv/vmbus_drv.c | 2 -
1864 drivers/hwmon/acpi_power_meter.c | 3 +-
1865 drivers/hwmon/asus_atk0110.c | 6 +-
1866 drivers/ide/ide-acpi.c | 12 +-
1867 drivers/input/misc/atlas_btns.c | 2 +-
1868 drivers/iommu/amd_iommu_init.c | 1 -
1869 drivers/iommu/intel_irq_remapping.c | 4 +-
1870 drivers/mmc/core/sdio_bus.c | 2 +-
1871 drivers/pci/hotplug/acpiphp_glue.c | 6 +-
1872 drivers/pci/hotplug/acpiphp_ibm.c | 3 +-
1873 drivers/pci/hotplug/pciehp.h | 2 -
1874 drivers/pci/ioapic.c | 1 -
1875 drivers/pci/pci-acpi.c | 17 +-
1876 drivers/pci/pci-label.c | 1 -
1877 drivers/pinctrl/pinctrl-baytrail.c | 1 +
1878 drivers/platform/x86/acer-wmi.c | 2 -
1879 drivers/platform/x86/asus-laptop.c | 3 +-
1880 drivers/platform/x86/asus-wmi.c | 3 +-
1881 drivers/platform/x86/classmate-laptop.c | 3 +-
1882 drivers/platform/x86/dell-wmi-aio.c | 1 -
1883 drivers/platform/x86/dell-wmi.c | 1 -
1884 drivers/platform/x86/eeepc-laptop.c | 3 +-
1885 drivers/platform/x86/eeepc-wmi.c | 2 +-
1886 drivers/platform/x86/hp_accel.c | 2 +-
1887 drivers/platform/x86/ideapad-laptop.c | 3 +-
1888 drivers/platform/x86/intel-rst.c | 2 +-
1889 drivers/platform/x86/intel-smartconnect.c | 2 +-
1890 drivers/platform/x86/intel_menlow.c | 4 +-
1891 drivers/platform/x86/intel_oaktrail.c | 3 -
1892 drivers/platform/x86/mxm-wmi.c | 3 +-
1893 drivers/platform/x86/panasonic-laptop.c | 4 +-
1894 drivers/platform/x86/pvpanic.c | 3 +-
1895 drivers/platform/x86/samsung-q10.c | 2 +-
1896 drivers/platform/x86/sony-laptop.c | 4 +-
1897 drivers/platform/x86/tc1100-wmi.c | 4 +-
1898 drivers/platform/x86/thinkpad_acpi.c | 14 +-
1899 drivers/platform/x86/toshiba_acpi.c | 4 +-
1900 drivers/platform/x86/toshiba_bluetooth.c | 4 +-
1901 drivers/platform/x86/wmi.c | 2 -
1902 drivers/platform/x86/xo15-ebook.c | 3 +-
1903 drivers/pnp/pnpacpi/core.c | 22 +-
1904 drivers/pnp/pnpacpi/pnpacpi.h | 1 -
1905 drivers/sfi/sfi_acpi.c | 2 +-
1906 drivers/staging/quickstart/quickstart.c | 2 +-
1907 drivers/usb/core/usb-acpi.c | 41 +-
1908 drivers/xen/xen-acpi-cpuhotplug.c | 11 +-
1909 drivers/xen/xen-acpi-memhotplug.c | 8 +-
1910 drivers/xen/xen-acpi-pad.c | 5 +-
1911 drivers/xen/xen-acpi-processor.c | 4 +-
1912 include/acpi/acpi_bus.h | 37 +-
1913 include/acpi/acpi_drivers.h | 3 -
1914 include/linux/acpi.h | 6 +
1915 include/linux/acpi_io.h | 2 +-
1916 include/linux/ide.h | 8 +-
1917 include/linux/iscsi_ibft.h | 2 +-
1918 include/linux/pci_hotplug.h | 3 +-
1919 include/linux/sfi_acpi.h | 2 +-
1920 include/linux/tboot.h | 2 +-
1921 kernel/power/hibernate.c | 1 +
1922 .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 5 +-
1923 118 files changed, 564 insertions(+), 857 deletions(-)
1924 Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX)
1925 $ git merge idle/next
1926 Merge made by the 'recursive' strategy.
1927 tools/power/x86/turbostat/turbostat.c | 42 ++++++++++++++++++++++++++---------
1928 1 file changed, 31 insertions(+), 11 deletions(-)
1929 Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
1930 $ git merge apm/for-next
1932 Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
1933 $ git merge cpupowerutils/master
1935 Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next)
1936 $ git merge thermal/next
1938 Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
1939 $ git merge ieee1394/for-next
1941 Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
1942 $ git merge ubi/linux-next
1944 Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
1945 $ git merge dlm/next
1947 Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
1948 $ git merge swiotlb/linux-next
1950 Merging slave-dma/next (29732357a296 Merge branch 'for-linus' into next)
1951 $ git merge slave-dma/next
1952 Resolved 'arch/arm/boot/dts/imx51.dtsi' using previous resolution.
1953 Resolved 'arch/arm/boot/dts/imx53.dtsi' using previous resolution.
1954 Auto-merging arch/arm/boot/dts/imx6sl.dtsi
1955 Auto-merging arch/arm/boot/dts/imx6qdl.dtsi
1956 Auto-merging arch/arm/boot/dts/imx53.dtsi
1957 CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi
1958 Auto-merging arch/arm/boot/dts/imx51.dtsi
1959 CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi
1960 Automatic merge failed; fix conflicts and then commit the result.
1962 [master 5db3fc00e796] Merge remote-tracking branch 'slave-dma/next'
1963 $ git diff -M --stat --summary HEAD^..
1964 .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
1965 arch/arm/boot/dts/imx51.dtsi | 4 +-
1966 arch/arm/boot/dts/imx53.dtsi | 4 +-
1967 arch/arm/boot/dts/imx6qdl.dtsi | 12 +-
1968 arch/arm/boot/dts/imx6sl.dtsi | 12 +-
1969 drivers/dma/amba-pl08x.c | 2 +-
1970 drivers/dma/imx-sdma.c | 19 +-
1971 drivers/dma/mmp_pdma.c | 205 +++++++++++----------
1972 drivers/dma/mmp_tdma.c | 6 +-
1973 drivers/dma/pl330.c | 6 +
1974 drivers/dma/s3c24xx-dma.c | 33 +---
1975 drivers/dma/sh/rcar-hpbdma.c | 11 +-
1976 include/linux/platform_data/dma-imx-sdma.h | 5 +
1977 include/linux/platform_data/dma-imx.h | 1 +
1978 sound/soc/fsl/fsl_ssi.c | 27 ++-
1979 15 files changed, 195 insertions(+), 153 deletions(-)
1980 Merging dmaengine/next (9e70a236fc69 dmaengine: fix enable for high order unmap pools)
1981 $ git merge dmaengine/next
1982 Merge made by the 'recursive' strategy.
1983 drivers/dma/Kconfig | 6 ++++++
1984 drivers/dma/at_hdmac_regs.h | 4 ----
1985 drivers/dma/dmaengine.c | 2 +-
1986 drivers/dma/dmatest.c | 8 ++++----
1987 drivers/dma/fsldma.c | 31 +------------------------------
1988 drivers/dma/mv_xor.c | 6 ------
1989 drivers/dma/ppc4xx/adma.c | 27 +--------------------------
1990 drivers/dma/txx9dmac.c | 1 -
1991 8 files changed, 13 insertions(+), 72 deletions(-)
1992 Merging net-next/master (0d74c42f788c ether_addr_equal: Optimize implementation, remove unused compare_ether_addr)
1993 $ git merge net-next/master
1994 Auto-merging net/sctp/transport.c
1995 Auto-merging net/sched/act_skbedit.c
1996 Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
1997 Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
1998 Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
1999 Auto-merging drivers/net/virtio_net.c
2000 Auto-merging drivers/net/tun.c
2001 Auto-merging drivers/net/macvtap.c
2002 Auto-merging drivers/net/ethernet/nvidia/forcedeth.c
2003 Auto-merging drivers/net/bonding/bond_sysfs.c
2004 Auto-merging MAINTAINERS
2005 Merge made by the 'recursive' strategy.
2006 Documentation/devicetree/bindings/net/phy.txt | 1 +
2007 Documentation/networking/ip-sysctl.txt | 10 +
2008 Documentation/networking/regulatory.txt | 4 +-
2009 Documentation/networking/timestamping.txt | 9 +-
2010 Documentation/networking/timestamping/.gitignore | 1 +
2011 Documentation/networking/timestamping/Makefile | 5 +-
2012 .../networking/timestamping/hwtstamp_config.c | 134 ++
2013 Documentation/unaligned-memory-access.txt | 28 +-
2015 drivers/bcma/host_pci.c | 1 -
2016 drivers/net/bonding/bond_alb.c | 3 +-
2017 drivers/net/bonding/bond_alb.h | 3 +-
2018 drivers/net/bonding/bond_sysfs.c | 3 +-
2019 drivers/net/ethernet/3com/3c59x.c | 2 +-
2020 drivers/net/ethernet/adi/bfin_mac.c | 21 +-
2021 drivers/net/ethernet/amd/amd8111e.c | 4 +-
2022 drivers/net/ethernet/amd/amd8111e.h | 4 +-
2023 drivers/net/ethernet/amd/au1000_eth.c | 3 +-
2024 drivers/net/ethernet/amd/au1000_eth.h | 3 +-
2025 drivers/net/ethernet/arc/emac.h | 2 -
2026 drivers/net/ethernet/arc/emac_main.c | 20 +-
2027 drivers/net/ethernet/broadcom/sb1250-mac.c | 3 +-
2028 drivers/net/ethernet/broadcom/tg3.c | 108 +-
2029 drivers/net/ethernet/broadcom/tg3.h | 6 +-
2030 drivers/net/ethernet/chelsio/cxgb/common.h | 3 +-
2031 drivers/net/ethernet/chelsio/cxgb/cphy.h | 3 +-
2032 drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h | 3 +-
2033 drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 3 +-
2034 drivers/net/ethernet/chelsio/cxgb/elmer0.h | 3 +-
2035 drivers/net/ethernet/chelsio/cxgb/espi.c | 3 +-
2036 drivers/net/ethernet/chelsio/cxgb/espi.h | 3 +-
2037 drivers/net/ethernet/chelsio/cxgb/gmac.h | 3 +-
2038 drivers/net/ethernet/chelsio/cxgb/mv88x201x.c | 3 +-
2039 drivers/net/ethernet/chelsio/cxgb/pm3393.c | 3 +-
2040 drivers/net/ethernet/chelsio/cxgb/regs.h | 3 +-
2041 drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +-
2042 drivers/net/ethernet/chelsio/cxgb/sge.h | 3 +-
2043 drivers/net/ethernet/chelsio/cxgb/subr.c | 3 +-
2044 .../net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h | 3 +-
2045 drivers/net/ethernet/freescale/fec.h | 3 +-
2046 drivers/net/ethernet/freescale/fec_main.c | 8 +-
2047 drivers/net/ethernet/freescale/fec_ptp.c | 16 +-
2048 drivers/net/ethernet/freescale/gianfar.c | 22 +-
2049 drivers/net/ethernet/ibm/ibmveth.c | 3 +-
2050 drivers/net/ethernet/ibm/ibmveth.h | 3 +-
2051 drivers/net/ethernet/intel/e1000e/netdev.c | 14 +-
2052 drivers/net/ethernet/intel/i40e/i40e.h | 19 +-
2053 drivers/net/ethernet/intel/i40e/i40e_adminq.c | 66 +-
2054 drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
2055 drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +-
2056 drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +
2057 drivers/net/ethernet/intel/i40e/i40e_diag.c | 8 +-
2058 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +-
2059 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 4 +-
2060 drivers/net/ethernet/intel/i40e/i40e_main.c | 37 +-
2061 drivers/net/ethernet/intel/i40e/i40e_register.h | 134 +-
2062 drivers/net/ethernet/intel/i40e/i40e_type.h | 11 +-
2063 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 8 +-
2064 drivers/net/ethernet/lantiq_etop.c | 3 +-
2065 drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +-
2066 drivers/net/ethernet/marvell/pxa168_eth.c | 3 +-
2067 drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 14 +-
2068 drivers/net/ethernet/natsemi/ns83820.c | 3 +-
2069 drivers/net/ethernet/neterion/vxge/vxge-main.c | 27 +-
2070 drivers/net/ethernet/netx-eth.c | 3 +-
2071 drivers/net/ethernet/nvidia/forcedeth.c | 3 +-
2072 drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 3 +-
2073 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c | 3 +-
2074 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h | 3 +-
2075 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 3 +-
2076 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 3 +-
2077 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 3 +-
2078 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c | 3 +-
2079 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h | 3 +-
2080 drivers/net/ethernet/pasemi/pasemi_mac.c | 3 +-
2081 drivers/net/ethernet/pasemi/pasemi_mac.h | 3 +-
2082 drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c | 3 +-
2083 drivers/net/ethernet/qlogic/netxen/Makefile | 4 +-
2084 drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 4 +-
2085 .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 4 +-
2086 .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 4 +-
2087 .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 4 +-
2088 drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 4 +-
2089 drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h | 4 +-
2090 .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +-
2091 .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +-
2092 drivers/net/ethernet/sfc/efx.c | 4 +-
2093 drivers/net/ethernet/sfc/nic.h | 3 +-
2094 drivers/net/ethernet/sfc/ptp.c | 11 +-
2095 drivers/net/ethernet/smsc/smc911x.c | 3 +-
2096 drivers/net/ethernet/smsc/smc911x.h | 3 +-
2097 drivers/net/ethernet/smsc/smc91x.c | 3 +-
2098 drivers/net/ethernet/smsc/smc91x.h | 3 +-
2099 drivers/net/ethernet/smsc/smsc911x.c | 3 +-
2100 drivers/net/ethernet/smsc/smsc911x.h | 3 +-
2101 drivers/net/ethernet/smsc/smsc9420.c | 3 +-
2102 drivers/net/ethernet/smsc/smsc9420.h | 3 +-
2103 drivers/net/ethernet/sun/cassini.c | 4 +-
2104 drivers/net/ethernet/sun/cassini.h | 4 +-
2105 drivers/net/ethernet/ti/cpsw.c | 24 +-
2106 drivers/net/ethernet/tile/tilegx.c | 22 +-
2107 drivers/net/ethernet/tundra/tsi108_eth.h | 4 +-
2108 drivers/net/ethernet/xircom/xirc2ps_cs.c | 3 +-
2109 drivers/net/ethernet/xscale/ixp4xx_eth.c | 36 +-
2110 drivers/net/fddi/defxx.c | 20 +-
2111 drivers/net/hamradio/mkiss.c | 3 +-
2112 drivers/net/hyperv/hyperv_net.h | 3 +-
2113 drivers/net/hyperv/netvsc.c | 3 +-
2114 drivers/net/hyperv/netvsc_drv.c | 3 +-
2115 drivers/net/hyperv/rndis_filter.c | 3 +-
2116 drivers/net/irda/au1k_ir.c | 3 +-
2117 drivers/net/irda/esi-sir.c | 4 +-
2118 drivers/net/irda/litelink-sir.c | 4 +-
2119 drivers/net/irda/ma600-sir.c | 4 +-
2120 drivers/net/irda/old_belkin-sir.c | 4 +-
2121 drivers/net/irda/smsc-ircc2.c | 4 +-
2122 drivers/net/irda/smsc-ircc2.h | 4 +-
2123 drivers/net/irda/via-ircc.c | 3 +-
2124 drivers/net/irda/via-ircc.h | 3 +-
2125 drivers/net/irda/vlsi_ir.c | 4 +-
2126 drivers/net/irda/vlsi_ir.h | 4 +-
2127 drivers/net/macvlan.c | 8 +-
2128 drivers/net/macvtap.c | 14 +-
2129 drivers/net/ppp/ppp_mppe.c | 3 +-
2130 drivers/net/tun.c | 19 +-
2131 drivers/net/usb/asix.h | 3 +-
2132 drivers/net/usb/asix_common.c | 3 +-
2133 drivers/net/usb/asix_devices.c | 3 +-
2134 drivers/net/usb/ax88172a.c | 3 +-
2135 drivers/net/usb/ax88179_178a.c | 3 +-
2136 drivers/net/usb/catc.c | 3 +-
2137 drivers/net/usb/cdc_eem.c | 3 +-
2138 drivers/net/usb/cdc_ether.c | 3 +-
2139 drivers/net/usb/cdc_subset.c | 3 +-
2140 drivers/net/usb/cx82310_eth.c | 3 +-
2141 drivers/net/usb/gl620a.c | 3 +-
2142 drivers/net/usb/int51x1.c | 3 +-
2143 drivers/net/usb/kaweth.c | 3 +-
2144 drivers/net/usb/lg-vl600.c | 3 +-
2145 drivers/net/usb/mcs7830.c | 3 +-
2146 drivers/net/usb/net1080.c | 3 +-
2147 drivers/net/usb/plusb.c | 3 +-
2148 drivers/net/usb/rndis_host.c | 3 +-
2149 drivers/net/usb/sierra_net.c | 3 +-
2150 drivers/net/usb/smsc75xx.c | 3 +-
2151 drivers/net/usb/smsc75xx.h | 3 +-
2152 drivers/net/usb/smsc95xx.c | 3 +-
2153 drivers/net/usb/smsc95xx.h | 3 +-
2154 drivers/net/usb/usbnet.c | 3 +-
2155 drivers/net/usb/zaurus.c | 3 +-
2156 drivers/net/virtio_net.c | 3 +-
2157 drivers/net/wireless/ath/ath10k/mac.c | 4 +-
2158 drivers/net/wireless/ath/ath6kl/cfg80211.c | 11 +-
2159 drivers/net/wireless/ath/ath9k/Kconfig | 10 +-
2160 drivers/net/wireless/ath/ath9k/Makefile | 8 +-
2161 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 31 +-
2162 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 114 +-
2163 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 122 +-
2164 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 9 +-
2165 drivers/net/wireless/ath/ath9k/ar9003_wow.c | 422 ++++++
2166 drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 390 ++---
2167 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 32 +-
2168 .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 1559 +-------------------
2169 .../net/wireless/ath/ath9k/ar9565_1p1_initvals.h | 64 +
2170 .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 559 ++++---
2171 drivers/net/wireless/ath/ath9k/ath9k.h | 56 +-
2172 drivers/net/wireless/ath/ath9k/debug.c | 115 +-
2173 drivers/net/wireless/ath/ath9k/hw.c | 24 +-
2174 drivers/net/wireless/ath/ath9k/hw.h | 5 +-
2175 drivers/net/wireless/ath/ath9k/init.c | 26 +-
2176 drivers/net/wireless/ath/ath9k/main.c | 541 +------
2177 drivers/net/wireless/ath/ath9k/pci.c | 45 +
2178 drivers/net/wireless/ath/ath9k/reg.h | 12 +-
2179 drivers/net/wireless/ath/ath9k/tx99.c | 264 ++++
2180 drivers/net/wireless/ath/ath9k/wow.c | 589 ++++----
2181 drivers/net/wireless/ath/ath9k/xmit.c | 7 +
2182 drivers/net/wireless/ath/regd.c | 378 ++---
2183 drivers/net/wireless/ath/wcn36xx/hal.h | 2 +-
2184 drivers/net/wireless/ath/wcn36xx/main.c | 3 +-
2185 drivers/net/wireless/ath/wcn36xx/smd.c | 21 +-
2186 drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +-
2187 drivers/net/wireless/brcm80211/Kconfig | 5 +-
2188 drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +-
2189 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 384 +++++
2190 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h | 24 +
2191 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 3 -
2192 .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 51 +-
2193 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 482 +-----
2194 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 15 +-
2195 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 392 -----
2196 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 22 +-
2197 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 36 +-
2198 drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 2 +-
2199 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 194 +--
2200 .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 42 -
2201 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 462 +++---
2202 drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 54 +
2203 drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 7 +-
2204 drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 61 +
2205 .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 304 ++++
2206 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 173 ++-
2207 drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +-
2208 drivers/net/wireless/brcm80211/brcmfmac/proto.c | 62 +
2209 drivers/net/wireless/brcm80211/brcmfmac/proto.h | 57 +
2210 .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 33 +-
2211 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 4 +-
2212 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 29 +-
2213 drivers/net/wireless/brcm80211/brcmsmac/channel.c | 38 +-
2214 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 66 +-
2215 drivers/net/wireless/cw1200/cw1200_sdio.c | 4 +-
2216 drivers/net/wireless/cw1200/scan.c | 15 +-
2217 drivers/net/wireless/ipw2x00/ipw2100.c | 5 +-
2218 drivers/net/wireless/ipw2x00/ipw2200.c | 8 +-
2219 drivers/net/wireless/iwlegacy/3945-mac.c | 11 +-
2220 drivers/net/wireless/iwlegacy/4965-mac.c | 8 +-
2221 drivers/net/wireless/iwlegacy/common.c | 4 +-
2222 drivers/net/wireless/iwlegacy/debug.c | 8 +-
2223 drivers/net/wireless/iwlwifi/dvm/debugfs.c | 8 +-
2224 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 6 +-
2225 drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +-
2226 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 4 +-
2227 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 4 +-
2228 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 +-
2229 drivers/net/wireless/iwlwifi/mvm/scan.c | 4 +-
2230 drivers/net/wireless/libertas/if_sdio.c | 6 +-
2231 drivers/net/wireless/libertas/if_spi.c | 1 -
2232 drivers/net/wireless/mac80211_hwsim.c | 101 +-
2233 drivers/net/wireless/mwifiex/cfg80211.c | 25 +-
2234 drivers/net/wireless/mwifiex/scan.c | 4 +-
2235 drivers/net/wireless/mwifiex/sta_cmdresp.c | 35 +-
2236 drivers/net/wireless/prism54/islpci_dev.c | 1 -
2237 drivers/net/wireless/prism54/islpci_hotplug.c | 2 -
2238 drivers/net/wireless/rt2x00/rt2800lib.c | 37 +-
2239 drivers/net/wireless/rt2x00/rt2x00pci.c | 3 -
2240 drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 +-
2241 drivers/net/wireless/rtlwifi/base.c | 3 +-
2242 drivers/net/wireless/rtlwifi/core.c | 11 +
2243 drivers/net/wireless/rtlwifi/pci.c | 2 -
2244 drivers/net/wireless/rtlwifi/regd.c | 61 +-
2245 drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 2 +-
2246 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 327 ++--
2247 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 14 +
2248 drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 39 +-
2249 drivers/net/wireless/rtlwifi/rtl8192cu/dm.c | 9 +
2250 drivers/net/wireless/rtlwifi/rtl8192cu/dm.h | 3 +
2251 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
2252 drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 6 +-
2253 drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 29 +-
2254 drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 16 +-
2255 drivers/net/wireless/rtlwifi/rtl8192cu/table.c | 40 +-
2256 drivers/net/wireless/rtlwifi/stats.c | 14 +
2257 drivers/net/wireless/rtlwifi/usb.c | 8 +-
2258 drivers/net/wireless/rtlwifi/wifi.h | 33 +-
2259 drivers/net/wireless/ti/wl1251/acx.c | 209 +--
2260 drivers/net/wireless/ti/wl12xx/scan.c | 2 +-
2261 drivers/net/wireless/ti/wlcore/cmd.c | 2 +-
2262 drivers/net/wireless/ti/wlcore/main.c | 3 +-
2263 drivers/net/wireless/ti/wlcore/scan.c | 12 +-
2264 drivers/net/xen-netback/xenbus.c | 3 +-
2265 drivers/of/of_mdio.c | 135 +-
2266 drivers/vhost/net.c | 9 +-
2267 drivers/vhost/scsi.c | 7 +-
2268 drivers/vhost/test.c | 8 +-
2269 drivers/vhost/vhost.c | 4 +-
2270 drivers/vhost/vhost.h | 2 +-
2271 include/linux/etherdevice.h | 51 +-
2272 include/linux/ieee80211.h | 8 +-
2273 include/linux/netdevice.h | 53 +-
2274 include/linux/phy.h | 23 +-
2275 include/linux/sctp.h | 5 +-
2276 include/net/addrconf.h | 4 +-
2277 include/net/cfg80211.h | 76 +-
2278 include/net/cipso_ipv4.h | 3 +-
2279 include/net/dcbevent.h | 3 +-
2280 include/net/dcbnl.h | 3 +-
2281 include/net/if_inet6.h | 2 +-
2282 include/net/irda/discovery.h | 4 +-
2283 include/net/irda/ircomm_core.h | 4 +-
2284 include/net/irda/ircomm_event.h | 4 +-
2285 include/net/irda/ircomm_lmp.h | 4 +-
2286 include/net/irda/ircomm_param.h | 4 +-
2287 include/net/irda/ircomm_ttp.h | 4 +-
2288 include/net/irda/ircomm_tty.h | 4 +-
2289 include/net/irda/ircomm_tty_attach.h | 4 +-
2290 include/net/irda/irda_device.h | 4 +-
2291 include/net/irda/irlap_event.h | 4 +-
2292 include/net/irda/irlap_frame.h | 4 +-
2293 include/net/irda/parameters.h | 4 +-
2294 include/net/irda/qos.h | 4 +-
2295 include/net/mac80211.h | 40 +
2296 include/net/mip6.h | 3 +-
2297 include/net/netlabel.h | 3 +-
2298 include/net/nfc/hci.h | 4 +-
2299 include/net/nfc/llc.h | 4 +-
2300 include/net/nfc/nci.h | 3 +-
2301 include/net/nfc/nci_core.h | 3 +-
2302 include/net/nfc/nfc.h | 4 +-
2303 include/net/regulatory.h | 80 +-
2304 include/net/sctp/auth.h | 5 +-
2305 include/net/sctp/checksum.h | 5 +-
2306 include/net/sctp/command.h | 5 +-
2307 include/net/sctp/constants.h | 5 +-
2308 include/net/sctp/sctp.h | 5 +-
2309 include/net/sctp/sm.h | 5 +-
2310 include/net/sctp/structs.h | 5 +-
2311 include/net/sctp/tsnmap.h | 5 +-
2312 include/net/sctp/ulpevent.h | 5 +-
2313 include/net/sctp/ulpqueue.h | 5 +-
2314 include/net/tc_act/tc_skbedit.h | 3 +-
2315 include/net/tcp.h | 1 +
2316 include/uapi/linux/if_addr.h | 5 +
2317 include/uapi/linux/net_tstamp.h | 16 +-
2318 include/uapi/linux/netfilter/xt_osf.h | 3 +-
2319 include/uapi/linux/nl80211.h | 47 +-
2320 include/uapi/linux/sctp.h | 5 +-
2321 include/uapi/linux/snmp.h | 1 +
2322 include/uapi/linux/sockios.h | 3 +-
2323 net/bluetooth/bnep/bnep.h | 3 +-
2324 net/bridge/netfilter/ebt_vlan.c | 3 +-
2325 net/core/dev.c | 48 +-
2326 net/core/dev_ioctl.c | 2 +
2327 net/dcb/dcbevent.c | 3 +-
2328 net/dcb/dcbnl.c | 3 +-
2329 net/dns_resolver/dns_key.c | 3 +-
2330 net/dns_resolver/dns_query.c | 3 +-
2331 net/dns_resolver/internal.h | 3 +-
2332 net/ipv4/cipso_ipv4.c | 3 +-
2333 net/ipv4/netfilter/nf_nat_snmp_basic.c | 3 +-
2334 net/ipv4/proc.c | 1 +
2335 net/ipv4/sysctl_net_ipv4.c | 9 +
2336 net/ipv4/tcp.c | 63 +-
2337 net/ipv4/tcp_output.c | 36 +-
2338 net/ipv6/addrconf.c | 201 +--
2339 net/ipv6/ah6.c | 3 +-
2340 net/ipv6/esp6.c | 3 +-
2341 net/ipv6/ip6_output.c | 25 +-
2342 net/ipv6/ipcomp6.c | 3 +-
2343 net/ipv6/mip6.c | 3 +-
2344 net/ipv6/tunnel6.c | 3 +-
2345 net/ipv6/xfrm6_mode_ro.c | 3 +-
2346 net/ipv6/xfrm6_tunnel.c | 3 +-
2347 net/irda/af_irda.c | 4 +-
2348 net/irda/discovery.c | 4 +-
2349 net/irda/ircomm/ircomm_core.c | 4 +-
2350 net/irda/ircomm/ircomm_event.c | 4 +-
2351 net/irda/ircomm/ircomm_lmp.c | 4 +-
2352 net/irda/ircomm/ircomm_param.c | 4 +-
2353 net/irda/ircomm/ircomm_ttp.c | 4 +-
2354 net/irda/ircomm/ircomm_tty.c | 4 +-
2355 net/irda/ircomm/ircomm_tty_attach.c | 4 +-
2356 net/irda/ircomm/ircomm_tty_ioctl.c | 4 +-
2357 net/irda/irda_device.c | 4 +-
2358 net/irda/irlap.c | 4 +-
2359 net/irda/parameters.c | 4 +-
2360 net/irda/qos.c | 4 +-
2361 net/mac80211/cfg.c | 123 +-
2362 net/mac80211/chan.c | 141 +-
2363 net/mac80211/debugfs.c | 168 +++
2364 net/mac80211/debugfs_sta.c | 134 ++
2365 net/mac80211/ibss.c | 6 +-
2366 net/mac80211/ieee80211_i.h | 43 +-
2367 net/mac80211/iface.c | 14 +-
2368 net/mac80211/key.c | 62 +-
2369 net/mac80211/key.h | 13 +-
2370 net/mac80211/main.c | 147 +-
2371 net/mac80211/mesh.c | 7 +-
2372 net/mac80211/mesh.h | 6 +-
2373 net/mac80211/mesh_hwmp.c | 91 +-
2374 net/mac80211/mesh_pathtbl.c | 7 +-
2375 net/mac80211/mesh_plink.c | 708 ++++-----
2376 net/mac80211/mesh_ps.c | 3 +-
2377 net/mac80211/mesh_sync.c | 28 +-
2378 net/mac80211/mlme.c | 43 +-
2379 net/mac80211/rate.h | 4 +-
2380 net/mac80211/rc80211_minstrel.c | 3 +-
2381 net/mac80211/rc80211_minstrel_ht.c | 22 +-
2382 net/mac80211/rc80211_minstrel_ht_debugfs.c | 3 +-
2383 net/mac80211/rx.c | 88 +-
2384 net/mac80211/scan.c | 10 +-
2385 net/mac80211/sta_info.c | 40 +-
2386 net/mac80211/sta_info.h | 38 +-
2387 net/mac80211/status.c | 78 +
2388 net/mac80211/trace.h | 21 +-
2389 net/mac80211/tx.c | 41 +-
2390 net/mac80211/util.c | 95 +-
2391 net/mac80211/vht.c | 7 +-
2392 net/mac80211/wpa.c | 116 ++
2393 net/mac80211/wpa.h | 2 +
2394 net/netfilter/ipvs/ip_vs_nfct.c | 3 +-
2395 net/netfilter/xt_connmark.c | 3 +-
2396 net/netfilter/xt_osf.c | 3 +-
2397 net/netlabel/netlabel_addrlist.c | 3 +-
2398 net/netlabel/netlabel_addrlist.h | 3 +-
2399 net/netlabel/netlabel_cipso_v4.c | 3 +-
2400 net/netlabel/netlabel_cipso_v4.h | 3 +-
2401 net/netlabel/netlabel_domainhash.c | 3 +-
2402 net/netlabel/netlabel_domainhash.h | 3 +-
2403 net/netlabel/netlabel_kapi.c | 3 +-
2404 net/netlabel/netlabel_mgmt.c | 3 +-
2405 net/netlabel/netlabel_mgmt.h | 3 +-
2406 net/netlabel/netlabel_unlabeled.c | 3 +-
2407 net/netlabel/netlabel_unlabeled.h | 3 +-
2408 net/netlabel/netlabel_user.c | 3 +-
2409 net/netlabel/netlabel_user.h | 3 +-
2410 net/packet/af_packet.c | 10 +-
2411 net/sched/act_skbedit.c | 3 +-
2412 net/sched/sch_multiq.c | 3 +-
2413 net/sctp/associola.c | 70 +-
2414 net/sctp/auth.c | 5 +-
2415 net/sctp/bind_addr.c | 5 +-
2416 net/sctp/chunk.c | 5 +-
2417 net/sctp/command.c | 5 +-
2418 net/sctp/debug.c | 5 +-
2419 net/sctp/endpointola.c | 5 +-
2420 net/sctp/input.c | 5 +-
2421 net/sctp/inqueue.c | 5 +-
2422 net/sctp/ipv6.c | 5 +-
2423 net/sctp/objcnt.c | 5 +-
2424 net/sctp/output.c | 5 +-
2425 net/sctp/outqueue.c | 5 +-
2426 net/sctp/primitive.c | 5 +-
2427 net/sctp/proc.c | 5 +-
2428 net/sctp/protocol.c | 5 +-
2429 net/sctp/sm_make_chunk.c | 5 +-
2430 net/sctp/sm_sideeffect.c | 5 +-
2431 net/sctp/sm_statefuns.c | 5 +-
2432 net/sctp/sm_statetable.c | 5 +-
2433 net/sctp/socket.c | 5 +-
2434 net/sctp/ssnmap.c | 5 +-
2435 net/sctp/sysctl.c | 5 +-
2436 net/sctp/transport.c | 5 +-
2437 net/sctp/tsnmap.c | 5 +-
2438 net/sctp/ulpevent.c | 5 +-
2439 net/sctp/ulpqueue.c | 5 +-
2440 net/socket.c | 57 +-
2441 net/unix/af_unix.c | 9 +-
2442 net/wireless/chan.c | 203 ++-
2443 net/wireless/core.c | 6 +-
2444 net/wireless/core.h | 18 +-
2445 net/wireless/genregdb.awk | 45 +-
2446 net/wireless/ibss.c | 4 +-
2447 net/wireless/mesh.c | 3 +-
2448 net/wireless/mlme.c | 20 +-
2449 net/wireless/nl80211.c | 107 +-
2450 net/wireless/nl80211.h | 2 +-
2451 net/wireless/rdev-ops.h | 12 +-
2452 net/wireless/reg.c | 802 ++++++----
2453 net/wireless/reg.h | 3 +-
2454 net/wireless/trace.h | 15 +-
2455 449 files changed, 8515 insertions(+), 7462 deletions(-)
2456 create mode 100644 Documentation/networking/timestamping/hwtstamp_config.c
2457 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_wow.c
2458 create mode 100644 drivers/net/wireless/ath/ath9k/ar9565_1p1_initvals.h
2459 create mode 100644 drivers/net/wireless/ath/ath9k/tx99.c
2460 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
2461 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
2462 delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
2463 delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
2464 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.c
2465 create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/proto.h
2466 Merging ipsec-next/master (0e0d44ab4275 net: Remove FLOWI_FLAG_CAN_SLEEP)
2467 $ git merge ipsec-next/master
2468 Auto-merging net/sctp/ipv6.c
2469 Auto-merging net/ipv6/ip6_output.c
2470 Auto-merging include/net/ipv6.h
2471 Merge made by the 'recursive' strategy.
2472 include/net/flow.h | 3 +-
2473 include/net/ipv6.h | 6 +-
2474 include/net/netns/xfrm.h | 6 +-
2475 include/net/route.h | 8 +--
2476 include/net/xfrm.h | 13 ++--
2477 net/dccp/ipv4.c | 2 +-
2478 net/dccp/ipv6.c | 8 +--
2479 net/decnet/dn_route.c | 2 -
2480 net/ipv4/af_inet.c | 2 +-
2481 net/ipv4/datagram.c | 2 +-
2482 net/ipv4/raw.c | 2 +-
2483 net/ipv4/tcp_ipv4.c | 2 +-
2484 net/ipv4/udp.c | 2 +-
2485 net/ipv6/af_inet6.c | 2 +-
2486 net/ipv6/datagram.c | 2 +-
2487 net/ipv6/inet6_connection_sock.c | 4 +-
2488 net/ipv6/ip6_output.c | 12 +---
2489 net/ipv6/ping.c | 2 +-
2490 net/ipv6/raw.c | 2 +-
2491 net/ipv6/syncookies.c | 2 +-
2492 net/ipv6/tcp_ipv6.c | 4 +-
2493 net/ipv6/udp.c | 2 +-
2494 net/key/af_key.c | 23 +++---
2495 net/l2tp/l2tp_ip6.c | 2 +-
2496 net/sctp/ipv6.c | 4 +-
2497 net/xfrm/xfrm_policy.c | 151 +++++++++++++++++++--------------------
2498 net/xfrm/xfrm_state.c | 125 ++++++++++++++------------------
2499 net/xfrm/xfrm_user.c | 27 +++++--
2500 28 files changed, 204 insertions(+), 218 deletions(-)
2501 Merging wireless-next/master (d6b5075d73ad ath9k: Apply tuning caps for AR9330 and AR9485)
2502 $ git merge wireless-next/master
2503 Merge made by the 'recursive' strategy.
2504 drivers/bcma/host_pci.c | 2 +-
2505 drivers/bluetooth/ath3k.c | 4 +
2506 drivers/bluetooth/btmrvl_drv.h | 25 +-
2507 drivers/bluetooth/btmrvl_main.c | 130 +---
2508 drivers/bluetooth/btmrvl_sdio.c | 9 +-
2509 drivers/bluetooth/btmrvl_sdio.h | 2 -
2510 drivers/bluetooth/btusb.c | 7 +-
2511 drivers/net/wireless/ath/ath10k/ce.c | 53 +-
2512 drivers/net/wireless/ath/ath10k/ce.h | 2 +-
2513 drivers/net/wireless/ath/ath10k/core.c | 43 +-
2514 drivers/net/wireless/ath/ath10k/core.h | 23 +-
2515 drivers/net/wireless/ath/ath10k/debug.c | 94 +++
2516 drivers/net/wireless/ath/ath10k/debug.h | 6 +
2517 drivers/net/wireless/ath/ath10k/htc.c | 31 +-
2518 drivers/net/wireless/ath/ath10k/htt.c | 4 +-
2519 drivers/net/wireless/ath/ath10k/htt.h | 1 +
2520 drivers/net/wireless/ath/ath10k/htt_rx.c | 25 +-
2521 drivers/net/wireless/ath/ath10k/htt_tx.c | 11 +-
2522 drivers/net/wireless/ath/ath10k/hw.h | 1 +
2523 drivers/net/wireless/ath/ath10k/mac.c | 316 +++++++-
2524 drivers/net/wireless/ath/ath10k/pci.c | 791 ++++++++++++++-------
2525 drivers/net/wireless/ath/ath10k/pci.h | 14 +-
2526 drivers/net/wireless/ath/ath10k/txrx.c | 6 +-
2527 drivers/net/wireless/ath/ath10k/wmi.c | 302 +++++++-
2528 drivers/net/wireless/ath/ath10k/wmi.h | 96 ++-
2529 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 191 ++---
2530 .../wireless/ath/ath9k/ar9003_buffalo_initvals.h | 126 ++++
2531 drivers/net/wireless/ath/ath9k/ar9003_calib.c | 29 +-
2532 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 4 +-
2533 drivers/net/wireless/ath/ath9k/ar9003_hw.c | 18 +-
2534 drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +
2535 drivers/net/wireless/ath/ath9k/ar9003_phy.h | 5 +-
2536 .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 128 +---
2537 .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 401 +++++++++--
2538 drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 2 +
2539 .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 697 +++---------------
2540 drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 117 +--
2541 .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 540 +-------------
2542 .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 85 +--
2543 .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 13 +-
2544 drivers/net/wireless/ath/ath9k/hw.c | 6 +-
2545 drivers/net/wireless/ath/ath9k/hw.h | 2 +
2546 drivers/net/wireless/ath/ath9k/init.c | 39 +-
2547 drivers/net/wireless/ath/ath9k/reg.h | 3 -
2548 drivers/net/wireless/ath/wcn36xx/smd.c | 12 +-
2549 drivers/net/wireless/mwifiex/11n_aggr.c | 6 +-
2550 drivers/net/wireless/mwifiex/cfg80211.c | 1 +
2551 drivers/net/wireless/mwifiex/cmdevt.c | 4 +-
2552 drivers/net/wireless/mwifiex/decl.h | 1 +
2553 drivers/net/wireless/mwifiex/fw.h | 30 +-
2554 drivers/net/wireless/mwifiex/init.c | 3 +-
2555 drivers/net/wireless/mwifiex/main.c | 9 +-
2556 drivers/net/wireless/mwifiex/main.h | 2 +-
2557 drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
2558 drivers/net/wireless/mwifiex/sta_rx.c | 44 +-
2559 drivers/net/wireless/mwifiex/sta_tx.c | 1 +
2560 drivers/net/wireless/mwifiex/txrx.c | 15 +-
2561 drivers/net/wireless/mwifiex/uap_txrx.c | 39 +-
2562 drivers/net/wireless/mwifiex/usb.c | 4 +-
2563 drivers/net/wireless/mwifiex/util.c | 5 +-
2564 drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 2 +-
2565 include/linux/ath9k_platform.h | 2 +
2566 net/bluetooth/hci_core.c | 20 +-
2567 net/bluetooth/hci_event.c | 72 +-
2568 net/bluetooth/mgmt.c | 17 +-
2569 net/bluetooth/smp.c | 40 +-
2570 66 files changed, 2413 insertions(+), 2328 deletions(-)
2571 create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_buffalo_initvals.h
2572 Merging bluetooth/master (53b834d2333a Bluetooth: Use macros for connectionless slave broadcast features)
2573 $ git merge bluetooth/master
2574 Merge made by the 'recursive' strategy.
2575 include/net/bluetooth/bluetooth.h | 3 +
2576 include/net/bluetooth/hci.h | 6 +
2577 include/net/bluetooth/hci_core.h | 6 +
2578 include/net/bluetooth/l2cap.h | 45 +++
2579 net/bluetooth/af_bluetooth.c | 2 +-
2580 net/bluetooth/hci_core.c | 6 +-
2581 net/bluetooth/l2cap_core.c | 718 +++++++++++++++++++++++++++++++++++---
2582 net/bluetooth/l2cap_sock.c | 181 +++++++++-
2583 net/bluetooth/smp.c | 16 +-
2584 net/bluetooth/smp.h | 1 +
2585 10 files changed, 911 insertions(+), 73 deletions(-)
2586 Merging infiniband/for-next (b4fdf52b3fc8 Merge branches 'cma', 'cxgb4', 'flowsteer', 'ipoib', 'misc', 'mlx4', 'mlx5', 'nes', 'ocrdma', 'qib' and 'srp' into for-next)
2587 $ git merge infiniband/for-next
2589 Merging mtd/master (6ce4eac1f600 Linux 3.13-rc1)
2590 $ git merge mtd/master
2592 Merging l2-mtd/master (924a213383a9 mtd: sh_flctl: use devm_* managed allocators)
2593 $ git merge l2-mtd/master
2594 Auto-merging drivers/mtd/nand/mpc5121_nfc.c
2595 Auto-merging drivers/mtd/maps/pxa2xx-flash.c
2596 Merge made by the 'recursive' strategy.
2597 .../devicetree/bindings/mtd/gpmi-nand.txt | 8 +
2598 .../devicetree/bindings/mtd/pxa3xx-nand.txt | 6 +-
2599 Documentation/mtd/nand/pxa3xx-nand.txt | 113 ++++
2600 drivers/mtd/afs.c | 3 +-
2601 drivers/mtd/ar7part.c | 3 +-
2602 drivers/mtd/bcm47xxpart.c | 3 +-
2603 drivers/mtd/bcm63xxpart.c | 3 +-
2604 drivers/mtd/cmdlinepart.c | 3 +-
2605 drivers/mtd/devices/m25p80.c | 211 ++++++-
2606 drivers/mtd/devices/ms02-nv.c | 2 +-
2607 drivers/mtd/devices/mtd_dataflash.c | 5 +-
2608 drivers/mtd/maps/pxa2xx-flash.c | 2 +-
2609 drivers/mtd/maps/sun_uflash.c | 2 +-
2610 drivers/mtd/mtdcore.c | 10 +-
2611 drivers/mtd/mtdpart.c | 9 +-
2612 drivers/mtd/nand/Kconfig | 8 +-
2613 drivers/mtd/nand/diskonchip.c | 10 +-
2614 drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 127 ++--
2615 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 165 ++---
2616 drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 -
2617 drivers/mtd/nand/mpc5121_nfc.c | 6 -
2618 drivers/mtd/nand/mxc_nand.c | 5 +-
2619 drivers/mtd/nand/nand_base.c | 26 +-
2620 drivers/mtd/nand/pasemi_nand.c | 2 +-
2621 drivers/mtd/nand/pxa3xx_nand.c | 688 ++++++++++++++++-----
2622 drivers/mtd/nand/sh_flctl.c | 40 +-
2623 drivers/mtd/ofpart.c | 19 +-
2624 drivers/mtd/redboot.c | 3 +-
2625 drivers/mtd/tests/mtd_nandecctest.c | 2 +-
2626 fs/jffs2/malloc.c | 4 +
2627 include/linux/mtd/nand.h | 2 +-
2628 include/linux/mtd/partitions.h | 8 +-
2629 include/linux/of_mtd.h | 2 +-
2630 include/linux/platform_data/mtd-nand-pxa3xx.h | 3 +
2631 34 files changed, 1062 insertions(+), 443 deletions(-)
2632 create mode 100644 Documentation/mtd/nand/pxa3xx-nand.txt
2633 Merging crypto/master (e37b94ebffdd crypto: memneq - fix for archs without efficient unaligned access)
2634 $ git merge crypto/master
2635 Auto-merging MAINTAINERS
2636 Merge made by the 'recursive' strategy.
2638 crypto/Makefile | 5 -
2639 crypto/memneq.c | 80 +-
2640 crypto/pcrypt.c | 2 +-
2641 drivers/crypto/Kconfig | 12 +
2642 drivers/crypto/Makefile | 1 +
2643 drivers/crypto/ccp/Kconfig | 23 +
2644 drivers/crypto/ccp/Makefile | 10 +
2645 drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 355 ++++++
2646 drivers/crypto/ccp/ccp-crypto-aes-xts.c | 285 +++++
2647 drivers/crypto/ccp/ccp-crypto-aes.c | 375 ++++++
2648 drivers/crypto/ccp/ccp-crypto-main.c | 432 +++++++
2649 drivers/crypto/ccp/ccp-crypto-sha.c | 497 ++++++++
2650 drivers/crypto/ccp/ccp-crypto.h | 191 +++
2651 drivers/crypto/ccp/ccp-dev.c | 582 +++++++++
2652 drivers/crypto/ccp/ccp-dev.h | 272 ++++
2653 drivers/crypto/ccp/ccp-ops.c | 2020 ++++++++++++++++++++++++++++++
2654 drivers/crypto/ccp/ccp-pci.c | 360 ++++++
2655 drivers/crypto/omap-aes.c | 16 +-
2656 drivers/crypto/omap-sham.c | 7 +-
2657 drivers/crypto/talitos.c | 21 +-
2658 include/linux/ccp.h | 525 ++++++++
2659 include/linux/compiler-gcc.h | 3 +
2660 include/linux/compiler-intel.h | 7 +
2661 include/linux/compiler.h | 4 +
2662 kernel/padata.c | 2 +-
2663 26 files changed, 6052 insertions(+), 42 deletions(-)
2664 create mode 100644 drivers/crypto/ccp/Kconfig
2665 create mode 100644 drivers/crypto/ccp/Makefile
2666 create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-cmac.c
2667 create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-xts.c
2668 create mode 100644 drivers/crypto/ccp/ccp-crypto-aes.c
2669 create mode 100644 drivers/crypto/ccp/ccp-crypto-main.c
2670 create mode 100644 drivers/crypto/ccp/ccp-crypto-sha.c
2671 create mode 100644 drivers/crypto/ccp/ccp-crypto.h
2672 create mode 100644 drivers/crypto/ccp/ccp-dev.c
2673 create mode 100644 drivers/crypto/ccp/ccp-dev.h
2674 create mode 100644 drivers/crypto/ccp/ccp-ops.c
2675 create mode 100644 drivers/crypto/ccp/ccp-pci.c
2676 create mode 100644 include/linux/ccp.h
2677 Merging drm/drm-next (a3483353ca4e drm: check for !kdev in drm_unplug_minor())
2678 $ git merge drm/drm-next
2680 Merging drm-intel/for-linux-next (c461562e84d1 drm/i915: Remove duplicate intel_uncore_forcewake_reset.)
2681 $ git merge drm-intel/for-linux-next
2682 Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c'
2683 Auto-merging drivers/gpu/drm/i915/intel_pm.c
2684 Auto-merging drivers/gpu/drm/i915/intel_drv.h
2685 Auto-merging drivers/gpu/drm/i915/intel_dp.c
2686 Auto-merging drivers/gpu/drm/i915/intel_display.c
2687 CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
2688 Auto-merging drivers/gpu/drm/i915/intel_ddi.c
2689 Auto-merging drivers/gpu/drm/i915/i915_reg.h
2690 Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
2691 Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
2692 Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
2693 Auto-merging drivers/gpu/drm/i915/i915_gem.c
2694 Auto-merging drivers/gpu/drm/i915/i915_drv.h
2695 Auto-merging drivers/gpu/drm/i915/i915_drv.c
2696 Auto-merging drivers/gpu/drm/i915/i915_dma.c
2697 Automatic merge failed; fix conflicts and then commit the result.
2699 Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'.
2700 [master 3655530128cd] Merge remote-tracking branch 'drm-intel/for-linux-next'
2701 $ git diff -M --stat --summary HEAD^..
2702 drivers/char/Makefile | 2 +-
2703 drivers/char/agp/Kconfig | 5 +
2704 drivers/char/agp/Makefile | 2 +-
2705 drivers/char/agp/intel-agp.c | 5 -
2706 drivers/char/agp/intel-gtt.c | 18 +
2707 drivers/gpu/drm/i915/Kconfig | 32 +-
2708 drivers/gpu/drm/i915/dvo_ns2501.c | 73 +--
2709 drivers/gpu/drm/i915/i915_debugfs.c | 163 ++++--
2710 drivers/gpu/drm/i915/i915_dma.c | 32 +-
2711 drivers/gpu/drm/i915/i915_drv.c | 42 +-
2712 drivers/gpu/drm/i915/i915_drv.h | 143 +++--
2713 drivers/gpu/drm/i915/i915_gem.c | 16 +-
2714 drivers/gpu/drm/i915/i915_gem_context.c | 45 +-
2715 drivers/gpu/drm/i915/i915_gem_execbuffer.c | 49 +-
2716 drivers/gpu/drm/i915/i915_gem_gtt.c | 26 +-
2717 drivers/gpu/drm/i915/i915_irq.c | 31 +-
2718 drivers/gpu/drm/i915/i915_reg.h | 221 ++++----
2719 drivers/gpu/drm/i915/i915_suspend.c | 45 --
2720 drivers/gpu/drm/i915/i915_sysfs.c | 35 +-
2721 drivers/gpu/drm/i915/i915_ums.c | 27 +
2722 drivers/gpu/drm/i915/intel_bios.h | 48 +-
2723 drivers/gpu/drm/i915/intel_crt.c | 5 +-
2724 drivers/gpu/drm/i915/intel_ddi.c | 39 +-
2725 drivers/gpu/drm/i915/intel_display.c | 334 ++++++++---
2726 drivers/gpu/drm/i915/intel_dp.c | 58 +-
2727 drivers/gpu/drm/i915/intel_drv.h | 25 +-
2728 drivers/gpu/drm/i915/intel_dsi.c | 5 +-
2729 drivers/gpu/drm/i915/intel_dvo.c | 5 +-
2730 drivers/gpu/drm/i915/intel_fbdev.c | 63 ++-
2731 drivers/gpu/drm/i915/intel_hdmi.c | 67 +--
2732 drivers/gpu/drm/i915/intel_i2c.c | 15 +-
2733 drivers/gpu/drm/i915/intel_lvds.c | 21 +-
2734 drivers/gpu/drm/i915/intel_opregion.c | 51 +-
2735 drivers/gpu/drm/i915/intel_panel.c | 882 +++++++++++++++++++----------
2736 drivers/gpu/drm/i915/intel_pm.c | 418 ++++++++------
2737 drivers/gpu/drm/i915/intel_ringbuffer.c | 22 +-
2738 drivers/gpu/drm/i915/intel_sdvo.c | 60 +-
2739 drivers/gpu/drm/i915/intel_sdvo_regs.h | 40 +-
2740 drivers/gpu/drm/i915/intel_sideband.c | 29 +-
2741 drivers/gpu/drm/i915/intel_sprite.c | 18 +
2742 drivers/gpu/drm/i915/intel_uncore.c | 298 +++++++---
2743 include/uapi/drm/i915_drm.h | 19 +
2744 42 files changed, 2238 insertions(+), 1296 deletions(-)
2745 Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
2746 $ git merge drm-tegra/drm/for-next
2748 Merging sound/for-next (e8648e5e33e4 ALSA: hda - Ignore small negative LPIB delay correction)
2749 $ git merge sound/for-next
2750 Auto-merging sound/pci/hda/patch_realtek.c
2751 Auto-merging sound/pci/hda/patch_hdmi.c
2752 Removing sound/pci/cs46xx/imgs/cwcsnoop.h
2753 Removing sound/pci/cs46xx/imgs/cwcdma.h
2754 Removing sound/pci/cs46xx/imgs/cwcdma.asp
2755 Removing sound/pci/cs46xx/imgs/cwcbinhack.h
2756 Removing sound/pci/cs46xx/imgs/cwcasync.h
2757 Removing sound/pci/cs46xx/imgs/cwc4630.h
2758 Removing sound/pci/cs46xx/cs46xx_image.h
2759 Merge made by the 'recursive' strategy.
2760 sound/arm/aaci.c | 23 +-
2761 sound/pci/Kconfig | 1 +
2762 sound/pci/cs46xx/cs46xx.h | 5 +
2763 sound/pci/cs46xx/cs46xx_image.h | 3468 ------------------------------------
2764 sound/pci/cs46xx/cs46xx_lib.c | 265 ++-
2765 sound/pci/cs46xx/imgs/cwc4630.h | 320 ----
2766 sound/pci/cs46xx/imgs/cwcasync.h | 176 --
2767 sound/pci/cs46xx/imgs/cwcbinhack.h | 48 -
2768 sound/pci/cs46xx/imgs/cwcdma.asp | 170 --
2769 sound/pci/cs46xx/imgs/cwcdma.h | 68 -
2770 sound/pci/cs46xx/imgs/cwcsnoop.h | 46 -
2771 sound/pci/hda/Makefile | 5 +-
2772 sound/pci/hda/hda_codec.c | 185 +-
2773 sound/pci/hda/hda_codec.h | 6 +-
2774 sound/pci/hda/hda_generic.c | 25 +-
2775 sound/pci/hda/hda_intel.c | 49 +-
2776 sound/pci/hda/hda_local.h | 8 +-
2777 sound/pci/hda/patch_hdmi.c | 28 +-
2778 sound/pci/hda/patch_realtek.c | 63 +-
2779 19 files changed, 504 insertions(+), 4455 deletions(-)
2780 delete mode 100644 sound/pci/cs46xx/cs46xx_image.h
2781 delete mode 100644 sound/pci/cs46xx/imgs/cwc4630.h
2782 delete mode 100644 sound/pci/cs46xx/imgs/cwcasync.h
2783 delete mode 100644 sound/pci/cs46xx/imgs/cwcbinhack.h
2784 delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.asp
2785 delete mode 100644 sound/pci/cs46xx/imgs/cwcdma.h
2786 delete mode 100644 sound/pci/cs46xx/imgs/cwcsnoop.h
2787 Merging sound-asoc/for-next (620eb36b980b Merge remote-tracking branches 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/rcar', 'asoc/topic/samsung', 'asoc/topic/spear', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/uda1380', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next)
2788 $ git merge sound-asoc/for-next
2789 Resolved 'sound/soc/fsl/fsl_ssi.c' using previous resolution.
2790 Removing sound/soc/jz4740/jz4740-pcm.h
2791 Removing sound/soc/jz4740/jz4740-pcm.c
2792 Auto-merging sound/soc/fsl/fsl_ssi.c
2793 CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c
2794 Automatic merge failed; fix conflicts and then commit the result.
2796 [master ffa174ee6214] Merge remote-tracking branch 'sound-asoc/for-next'
2797 $ git diff -M --stat --summary HEAD^..
2798 .../devicetree/bindings/sound/adi,axi-i2s.txt | 31 +
2799 .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 30 +
2800 .../devicetree/bindings/sound/bcm2835-i2s.txt | 25 +
2801 .../devicetree/bindings/sound/cs42l52.txt | 46 ++
2802 .../devicetree/bindings/sound/eukrea-tlv320.txt | 21 +
2803 .../devicetree/bindings/sound/max98090.txt | 43 +
2804 .../bindings/sound/nvidia,tegra-audio-max98090.txt | 51 ++
2805 .../devicetree/bindings/sound/simple-card.txt | 68 ++
2806 drivers/mfd/wm5110-tables.c | 137 +++-
2807 include/linux/mfd/arizona/registers.h | 158 ++++
2808 include/sound/cs42l52.h | 14 +-
2809 include/sound/dmaengine_pcm.h | 10 +
2810 include/sound/rcar_snd.h | 2 +-
2811 include/sound/soc-dai.h | 6 +
2812 include/sound/soc.h | 17 +-
2813 sound/soc/Kconfig | 4 +-
2814 sound/soc/Makefile | 4 +-
2815 sound/soc/adi/Kconfig | 21 +
2816 sound/soc/adi/Makefile | 5 +
2817 sound/soc/adi/axi-i2s.c | 277 +++++++
2818 sound/soc/adi/axi-spdif.c | 272 +++++++
2819 sound/soc/atmel/atmel_ssc_dai.c | 30 +-
2820 sound/soc/atmel/sam9x5_wm8731.c | 2 +-
2821 sound/soc/bcm/Kconfig | 10 +
2822 sound/soc/bcm/Makefile | 5 +
2823 sound/soc/bcm/bcm2835-i2s.c | 879 +++++++++++++++++++++
2824 sound/soc/cirrus/ep93xx-pcm.c | 9 +-
2825 sound/soc/codecs/Kconfig | 2 +
2826 sound/soc/codecs/ad193x.c | 6 +-
2827 sound/soc/codecs/adav80x.c | 6 +-
2828 sound/soc/codecs/ak4641.c | 38 +-
2829 sound/soc/codecs/ak4642.c | 138 ++--
2830 sound/soc/codecs/arizona.c | 18 +
2831 sound/soc/codecs/arizona.h | 3 +-
2832 sound/soc/codecs/cs4271.c | 8 +-
2833 sound/soc/codecs/cs42l52.c | 105 ++-
2834 sound/soc/codecs/da7210.c | 6 +-
2835 sound/soc/codecs/hdmi.c | 2 +-
2836 sound/soc/codecs/ssm2602.c | 56 +-
2837 sound/soc/codecs/tlv320aic3x.c | 126 ++-
2838 sound/soc/codecs/uda1380.c | 6 +-
2839 sound/soc/codecs/wm5110.c | 364 ++++++++-
2840 sound/soc/codecs/wm8510.c | 6 +-
2841 sound/soc/codecs/wm8523.c | 6 +-
2842 sound/soc/codecs/wm8580.c | 6 +-
2843 sound/soc/codecs/wm8711.c | 6 +-
2844 sound/soc/codecs/wm8728.c | 6 +-
2845 sound/soc/codecs/wm8731.c | 6 +-
2846 sound/soc/codecs/wm8741.c | 6 +-
2847 sound/soc/codecs/wm8750.c | 6 +-
2848 sound/soc/codecs/wm8753.c | 6 +-
2849 sound/soc/codecs/wm8776.c | 6 +-
2850 sound/soc/codecs/wm8804.c | 6 +-
2851 sound/soc/codecs/wm8900.c | 6 +-
2852 sound/soc/codecs/wm8940.c | 221 +++---
2853 sound/soc/codecs/wm8962.c | 17 +-
2854 sound/soc/codecs/wm8974.c | 54 +-
2855 sound/soc/codecs/wm8985.c | 6 +-
2856 sound/soc/codecs/wm8988.c | 6 +-
2857 sound/soc/codecs/wm8990.c | 258 +++---
2858 sound/soc/codecs/wm8990.h | 9 -
2859 sound/soc/codecs/wm8991.c | 293 +++----
2860 sound/soc/codecs/wm8991.h | 9 -
2861 sound/soc/codecs/wm8994.c | 11 +-
2862 sound/soc/codecs/wm8995.c | 6 +-
2863 sound/soc/codecs/wm9081.c | 2 +-
2864 sound/soc/codecs/wm_adsp.c | 19 +-
2865 sound/soc/fsl/Kconfig | 5 +-
2866 sound/soc/fsl/eukrea-tlv320.c | 108 ++-
2867 sound/soc/fsl/fsl_spdif.c | 8 -
2868 sound/soc/fsl/fsl_ssi.c | 159 ++--
2869 sound/soc/fsl/imx-pcm-dma.c | 9 +-
2870 sound/soc/fsl/imx-pcm.h | 5 -
2871 sound/soc/fsl/imx-spdif.c | 1 -
2872 sound/soc/fsl/imx-ssi.c | 12 +-
2873 sound/soc/fsl/imx-ssi.h | 1 -
2874 sound/soc/fsl/imx-wm8962.c | 2 -
2875 sound/soc/generic/simple-card.c | 156 +++-
2876 sound/soc/{mid-x86 => intel}/Kconfig | 0
2877 sound/soc/{mid-x86 => intel}/Makefile | 0
2878 sound/soc/{mid-x86 => intel}/mfld_machine.c | 0
2879 sound/soc/{mid-x86 => intel}/sst_dsp.h | 0
2880 sound/soc/{mid-x86 => intel}/sst_platform.c | 0
2881 sound/soc/{mid-x86 => intel}/sst_platform.h | 0
2882 sound/soc/jz4740/Kconfig | 1 +
2883 sound/soc/jz4740/jz4740-i2s.c | 135 +---
2884 sound/soc/jz4740/jz4740-pcm.c | 358 ---------
2885 sound/soc/jz4740/jz4740-pcm.h | 20 -
2886 sound/soc/jz4740/qi_lb60.c | 2 +-
2887 sound/soc/mxs/mxs-pcm.c | 8 +-
2888 sound/soc/mxs/mxs-pcm.h | 1 -
2889 sound/soc/mxs/mxs-saif.c | 8 -
2890 sound/soc/omap/mcbsp.c | 12 +-
2891 sound/soc/omap/omap-dmic.c | 4 +-
2892 sound/soc/omap/omap-mcpdm.c | 4 +-
2893 sound/soc/sh/rcar/gen.c | 248 +++---
2894 sound/soc/sh/rcar/rsnd.h | 16 +-
2895 sound/soc/sh/rcar/ssi.c | 6 +-
2896 sound/soc/soc-devres.c | 41 +
2897 sound/soc/soc-generic-dmaengine-pcm.c | 78 +-
2898 sound/soc/soc-io.c | 4 +-
2899 sound/soc/soc-pcm.c | 161 +++-
2900 sound/soc/spear/spear_pcm.c | 9 +-
2901 sound/soc/tegra/Kconfig | 10 +
2902 sound/soc/tegra/Makefile | 2 +
2903 sound/soc/tegra/tegra20_i2s.c | 6 +-
2904 sound/soc/tegra/tegra20_spdif.c | 10 +-
2905 sound/soc/tegra/tegra30_i2s.c | 6 +-
2906 sound/soc/tegra/tegra_max98090.c | 275 +++++++
2907 109 files changed, 4349 insertions(+), 1586 deletions(-)
2908 create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
2909 create mode 100644 Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
2910 create mode 100644 Documentation/devicetree/bindings/sound/bcm2835-i2s.txt
2911 create mode 100644 Documentation/devicetree/bindings/sound/cs42l52.txt
2912 create mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
2913 create mode 100644 Documentation/devicetree/bindings/sound/max98090.txt
2914 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt
2915 create mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt
2916 create mode 100644 sound/soc/adi/Kconfig
2917 create mode 100644 sound/soc/adi/Makefile
2918 create mode 100644 sound/soc/adi/axi-i2s.c
2919 create mode 100644 sound/soc/adi/axi-spdif.c
2920 create mode 100644 sound/soc/bcm/Kconfig
2921 create mode 100644 sound/soc/bcm/Makefile
2922 create mode 100644 sound/soc/bcm/bcm2835-i2s.c
2923 rename sound/soc/{mid-x86 => intel}/Kconfig (100%)
2924 rename sound/soc/{mid-x86 => intel}/Makefile (100%)
2925 rename sound/soc/{mid-x86 => intel}/mfld_machine.c (100%)
2926 rename sound/soc/{mid-x86 => intel}/sst_dsp.h (100%)
2927 rename sound/soc/{mid-x86 => intel}/sst_platform.c (100%)
2928 rename sound/soc/{mid-x86 => intel}/sst_platform.h (100%)
2929 delete mode 100644 sound/soc/jz4740/jz4740-pcm.c
2930 delete mode 100644 sound/soc/jz4740/jz4740-pcm.h
2931 create mode 100644 sound/soc/tegra/tegra_max98090.c
2932 Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon)
2933 $ git merge modules/modules-next
2934 Merge made by the 'recursive' strategy.
2935 Documentation/module-signing.txt | 240 +++++++++++++++++++++++++++++++++++++++
2936 include/linux/module.h | 2 +-
2937 kernel/params.c | 25 ++--
2938 3 files changed, 250 insertions(+), 17 deletions(-)
2939 create mode 100644 Documentation/module-signing.txt
2940 Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata())
2941 $ git merge virtio/virtio-next
2942 Merge made by the 'recursive' strategy.
2943 drivers/virtio/virtio_pci.c | 2 --
2944 1 file changed, 2 deletions(-)
2945 Merging input/next (c838cb3d477f Input: use dev_get_platdata())
2946 $ git merge input/next
2947 Auto-merging drivers/input/touchscreen/cyttsp_core.c
2948 Auto-merging drivers/input/tablet/wacom_wac.c
2949 Auto-merging drivers/input/tablet/wacom_sys.c
2950 Auto-merging drivers/input/keyboard/bf54x-keys.c
2951 Auto-merging drivers/input/keyboard/adp5589-keys.c
2952 Auto-merging drivers/input/keyboard/adp5588-keys.c
2953 Auto-merging arch/sh/boards/mach-ecovec24/setup.c
2954 Merge made by the 'recursive' strategy.
2955 .../devicetree/bindings/input/gpio-beeper.txt | 13 ++
2956 .../bindings/input/touchscreen/tsc2007.txt | 41 ++++
2957 .../bindings/input/twl4030-pwrbutton.txt | 21 ++
2958 arch/arm/mach-imx/mach-cpuimx35.c | 2 +-
2959 arch/arm/mach-imx/mach-cpuimx51sd.c | 2 +-
2960 arch/sh/boards/mach-ecovec24/setup.c | 2 +-
2961 drivers/input/keyboard/Kconfig | 2 +-
2962 drivers/input/keyboard/adp5520-keys.c | 2 +-
2963 drivers/input/keyboard/adp5588-keys.c | 10 +-
2964 drivers/input/keyboard/adp5589-keys.c | 8 +-
2965 drivers/input/keyboard/bf54x-keys.c | 4 +-
2966 drivers/input/keyboard/davinci_keyscan.c | 2 +-
2967 drivers/input/keyboard/ep93xx_keypad.c | 2 +-
2968 drivers/input/keyboard/imx_keypad.c | 3 +-
2969 drivers/input/keyboard/lm8323.c | 2 +-
2970 drivers/input/keyboard/lm8333.c | 3 +-
2971 drivers/input/keyboard/max7359_keypad.c | 3 +-
2972 drivers/input/keyboard/mcs_touchkey.c | 2 +-
2973 drivers/input/keyboard/mpr121_touchkey.c | 3 +-
2974 drivers/input/keyboard/nomadik-ske-keypad.c | 3 +-
2975 drivers/input/keyboard/omap-keypad.c | 2 +-
2976 drivers/input/keyboard/pxa930_rotary.c | 3 +-
2977 drivers/input/keyboard/samsung-keypad.c | 2 +-
2978 drivers/input/keyboard/sh_keysc.c | 4 +-
2979 drivers/input/keyboard/tca6416-keypad.c | 2 +-
2980 drivers/input/keyboard/tnetv107x-keypad.c | 2 +-
2981 drivers/input/keyboard/twl4030_keypad.c | 2 +-
2982 drivers/input/keyboard/w90p910_keypad.c | 2 +-
2983 drivers/input/misc/Kconfig | 9 +
2984 drivers/input/misc/Makefile | 1 +
2985 drivers/input/misc/ad714x.c | 4 +-
2986 drivers/input/misc/adxl34x.c | 2 +-
2987 drivers/input/misc/bfin_rotary.c | 2 +-
2988 drivers/input/misc/bma150.c | 3 +-
2989 drivers/input/misc/cma3000_d0x.c | 2 +-
2990 drivers/input/misc/gp2ap002a00f.c | 2 +-
2991 drivers/input/misc/gpio-beeper.c | 127 ++++++++++++
2992 drivers/input/misc/gpio_tilt_polled.c | 3 +-
2993 drivers/input/misc/kxtj9.c | 3 +-
2994 drivers/input/misc/pwm-beeper.c | 2 +-
2995 drivers/input/misc/twl4030-pwrbutton.c | 46 ++---
2996 drivers/input/misc/twl4030-vibra.c | 2 +-
2997 drivers/input/mouse/gpio_mouse.c | 2 +-
2998 drivers/input/mouse/pxa930_trkball.c | 2 +-
2999 drivers/input/serio/pcips2.c | 1 -
3000 drivers/input/tablet/wacom_sys.c | 13 +-
3001 drivers/input/tablet/wacom_wac.c | 65 ++++--
3002 drivers/input/tablet/wacom_wac.h | 2 +
3003 drivers/input/touchscreen/88pm860x-ts.c | 2 +-
3004 drivers/input/touchscreen/ad7877.c | 2 +-
3005 drivers/input/touchscreen/ad7879.c | 4 +-
3006 drivers/input/touchscreen/ads7846.c | 4 +-
3007 drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
3008 drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
3009 drivers/input/touchscreen/cy8ctmg110_ts.c | 2 +-
3010 drivers/input/touchscreen/cyttsp_core.c | 4 +-
3011 drivers/input/touchscreen/da9034-ts.c | 2 +-
3012 drivers/input/touchscreen/edt-ft5x06.c | 2 +-
3013 drivers/input/touchscreen/eeti_ts.c | 2 +-
3014 drivers/input/touchscreen/ili210x.c | 2 +-
3015 drivers/input/touchscreen/mcs5000_ts.c | 4 +-
3016 drivers/input/touchscreen/pixcir_i2c_ts.c | 3 +-
3017 drivers/input/touchscreen/s3c2410_ts.c | 4 +-
3018 drivers/input/touchscreen/st1232.c | 2 +-
3019 drivers/input/touchscreen/tsc2005.c | 2 +-
3020 drivers/input/touchscreen/tsc2007.c | 230 ++++++++++++++-------
3021 drivers/input/touchscreen/ucb1400_ts.c | 8 +-
3022 drivers/input/touchscreen/wm97xx-core.c | 2 +-
3023 include/linux/i2c/tsc2007.h | 8 +-
3024 69 files changed, 537 insertions(+), 198 deletions(-)
3025 create mode 100644 Documentation/devicetree/bindings/input/gpio-beeper.txt
3026 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt
3027 create mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
3028 create mode 100644 drivers/input/misc/gpio-beeper.c
3029 Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
3030 $ git merge input-mt/for-next
3032 Merging cgroup/for-next (4d75ee4f3e9c Merge branch 'for-3.14' into for-next)
3033 $ git merge cgroup/for-next
3034 Auto-merging kernel/sched/core.c
3035 Merge made by the 'recursive' strategy.
3036 Documentation/cgroups/cgroups.txt | 20 -
3037 block/blk-throttle.c | 35 +-
3038 block/cfq-iosched.c | 131 ++---
3039 include/linux/cgroup.h | 109 ++--
3040 include/linux/vmpressure.h | 8 +-
3042 kernel/cgroup.c | 1173 +++++++++++++++----------------------
3043 kernel/cgroup_freezer.c | 7 +-
3044 kernel/cpuset.c | 71 +--
3045 kernel/sched/core.c | 13 +-
3046 kernel/sched/cpuacct.c | 18 +-
3047 mm/hugetlb_cgroup.c | 22 +-
3048 mm/memcontrol.c | 426 +++++++++++---
3049 mm/vmpressure.c | 26 +-
3050 net/core/netprio_cgroup.c | 8 +-
3051 security/device_cgroup.c | 7 +-
3052 16 files changed, 1004 insertions(+), 1073 deletions(-)
3053 Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next)
3054 $ git merge block/for-next
3055 Resolved 'block/blk-flush.c' using previous resolution.
3056 Resolved 'fs/btrfs/check-integrity.c' using previous resolution.
3057 Resolved 'fs/btrfs/extent_io.c' using previous resolution.
3058 Resolved 'fs/btrfs/scrub.c' using previous resolution.
3059 Resolved 'fs/f2fs/data.c' using previous resolution.
3060 Resolved 'fs/f2fs/segment.c' using previous resolution.
3061 Resolved 'fs/logfs/dev_bdev.c' using previous resolution.
3062 Resolved 'include/trace/events/f2fs.h' using previous resolution.
3063 Auto-merging include/trace/events/f2fs.h
3064 CONFLICT (content): Merge conflict in include/trace/events/f2fs.h
3065 Auto-merging fs/xfs/xfs_buf.c
3066 Auto-merging fs/logfs/dev_bdev.c
3067 CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c
3068 Auto-merging fs/hfsplus/wrapper.c
3069 Auto-merging fs/gfs2/ops_fstype.c
3070 Auto-merging fs/gfs2/lops.c
3071 Auto-merging fs/f2fs/segment.c
3072 CONFLICT (content): Merge conflict in fs/f2fs/segment.c
3073 Auto-merging fs/f2fs/data.c
3074 CONFLICT (content): Merge conflict in fs/f2fs/data.c
3075 Auto-merging fs/btrfs/scrub.c
3076 CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
3077 Auto-merging fs/btrfs/inode.c
3078 Auto-merging fs/btrfs/extent_io.c
3079 CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
3080 Auto-merging fs/btrfs/check-integrity.c
3081 CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c
3082 Auto-merging drivers/staging/zram/zram_drv.c
3083 Auto-merging drivers/scsi/sd.c
3084 Auto-merging drivers/s390/block/dasd_eckd.c
3085 Auto-merging drivers/md/raid5.c
3086 Auto-merging drivers/md/md.c
3087 Auto-merging drivers/block/xen-blkfront.c
3088 Auto-merging block/blk-throttle.c
3089 Auto-merging block/blk-mq.c
3090 Auto-merging block/blk-flush.c
3091 CONFLICT (content): Merge conflict in block/blk-flush.c
3092 Automatic merge failed; fix conflicts and then commit the result.
3094 [master 81559dea9411] Merge remote-tracking branch 'block/for-next'
3095 $ git diff -M --stat --summary HEAD^..
3096 Documentation/block/biodoc.txt | 7 +-
3097 Documentation/block/biovecs.txt | 111 ++++++
3098 arch/m68k/emu/nfblock.c | 13 +-
3099 arch/powerpc/sysdev/axonram.c | 21 +-
3100 block/blk-core.c | 40 +--
3101 block/blk-flush.c | 2 +-
3102 block/blk-integrity.c | 40 ++-
3103 block/blk-lib.c | 12 +-
3104 block/blk-map.c | 6 +-
3105 block/blk-merge.c | 66 ++--
3106 block/blk-mq.c | 2 +-
3107 block/blk-throttle.c | 14 +-
3108 block/elevator.c | 2 +-
3109 drivers/block/aoe/aoe.h | 10 +-
3110 drivers/block/aoe/aoecmd.c | 153 ++++-----
3111 drivers/block/brd.c | 16 +-
3112 drivers/block/drbd/drbd_actlog.c | 2 +-
3113 drivers/block/drbd/drbd_bitmap.c | 2 +-
3114 drivers/block/drbd/drbd_main.c | 27 +-
3115 drivers/block/drbd/drbd_receiver.c | 19 +-
3116 drivers/block/drbd/drbd_req.c | 6 +-
3117 drivers/block/drbd/drbd_req.h | 2 +-
3118 drivers/block/drbd/drbd_worker.c | 8 +-
3119 drivers/block/floppy.c | 16 +-
3120 drivers/block/loop.c | 27 +-
3121 drivers/block/mtip32xx/mtip32xx.c | 20 +-
3122 drivers/block/nbd.c | 14 +-
3123 drivers/block/nvme-core.c | 142 ++------
3124 drivers/block/pktcdvd.c | 182 +++++-----
3125 drivers/block/ps3disk.c | 17 +-
3126 drivers/block/ps3vram.c | 12 +-
3127 drivers/block/rbd.c | 91 +----
3128 drivers/block/rsxx/dev.c | 6 +-
3129 drivers/block/rsxx/dma.c | 15 +-
3130 drivers/block/umem.c | 53 ++-
3131 drivers/block/xen-blkback/blkback.c | 2 +-
3132 drivers/block/xen-blkfront.c | 2 +-
3133 drivers/cdrom/gdrom.c | 4 +-
3134 drivers/md/bcache/bcache.h | 2 -
3135 drivers/md/bcache/btree.c | 8 +-
3136 drivers/md/bcache/debug.c | 21 +-
3137 drivers/md/bcache/io.c | 196 ++---------
3138 drivers/md/bcache/journal.c | 12 +-
3139 drivers/md/bcache/movinggc.c | 4 +-
3140 drivers/md/bcache/request.c | 131 +++-----
3141 drivers/md/bcache/super.c | 20 +-
3142 drivers/md/bcache/util.c | 4 +-
3143 drivers/md/bcache/writeback.c | 6 +-
3144 drivers/md/bcache/writeback.h | 2 +-
3145 drivers/md/dm-bio-record.h | 37 +-
3146 drivers/md/dm-bufio.c | 2 +-
3147 drivers/md/dm-cache-policy-mq.c | 4 +-
3148 drivers/md/dm-cache-target.c | 28 +-
3149 drivers/md/dm-crypt.c | 64 ++--
3150 drivers/md/dm-delay.c | 7 +-
3151 drivers/md/dm-flakey.c | 7 +-
3152 drivers/md/dm-io.c | 37 +-
3153 drivers/md/dm-linear.c | 3 +-
3154 drivers/md/dm-raid1.c | 20 +-
3155 drivers/md/dm-region-hash.c | 3 +-
3156 drivers/md/dm-snap.c | 19 +-
3157 drivers/md/dm-stripe.c | 13 +-
3158 drivers/md/dm-switch.c | 4 +-
3159 drivers/md/dm-thin.c | 30 +-
3160 drivers/md/dm-verity.c | 62 ++--
3161 drivers/md/dm.c | 189 ++---------
3162 drivers/md/faulty.c | 19 +-
3163 drivers/md/linear.c | 96 +++---
3164 drivers/md/md.c | 12 +-
3165 drivers/md/multipath.c | 13 +-
3166 drivers/md/raid0.c | 79 ++---
3167 drivers/md/raid1.c | 75 +++--
3168 drivers/md/raid10.c | 194 +++++------
3169 drivers/md/raid5.c | 84 ++---
3170 drivers/message/fusion/mptsas.c | 8 +-
3171 drivers/s390/block/dasd_diag.c | 10 +-
3172 drivers/s390/block/dasd_eckd.c | 48 +--
3173 drivers/s390/block/dasd_fba.c | 26 +-
3174 drivers/s390/block/dcssblk.c | 21 +-
3175 drivers/s390/block/scm_blk.c | 8 +-
3176 drivers/s390/block/scm_blk_cluster.c | 4 +-
3177 drivers/s390/block/xpram.c | 19 +-
3178 drivers/scsi/libsas/sas_expander.c | 8 +-
3179 drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +--
3180 drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +--
3181 drivers/scsi/osd/osd_initiator.c | 2 +-
3182 drivers/scsi/sd.c | 2 +-
3183 drivers/scsi/sd_dif.c | 30 +-
3184 drivers/staging/lustre/lustre/llite/lloop.c | 26 +-
3185 drivers/staging/zram/zram_drv.c | 33 +-
3186 drivers/target/target_core_iblock.c | 2 +-
3187 fs/bio-integrity.c | 179 +++-------
3188 fs/bio.c | 502 +++++++++++++---------------
3189 fs/btrfs/check-integrity.c | 8 +-
3190 fs/btrfs/compression.c | 27 +-
3191 fs/btrfs/disk-io.c | 13 +-
3192 fs/btrfs/extent_io.c | 49 ++-
3193 fs/btrfs/file-item.c | 19 +-
3194 fs/btrfs/inode.c | 37 +-
3195 fs/btrfs/raid56.c | 22 +-
3196 fs/btrfs/scrub.c | 12 +-
3197 fs/btrfs/volumes.c | 14 +-
3199 fs/direct-io.c | 4 +-
3200 fs/ext4/page-io.c | 8 +-
3201 fs/f2fs/data.c | 34 +-
3202 fs/gfs2/lops.c | 2 +-
3203 fs/gfs2/ops_fstype.c | 2 +-
3204 fs/hfsplus/wrapper.c | 2 +-
3205 fs/jfs/jfs_logmgr.c | 12 +-
3206 fs/jfs/jfs_metapage.c | 9 +-
3207 fs/logfs/dev_bdev.c | 38 +--
3209 fs/nfs/blocklayout/blocklayout.c | 43 +--
3210 fs/nilfs2/segbuf.c | 3 +-
3211 fs/ocfs2/cluster/heartbeat.c | 2 +-
3212 fs/xfs/xfs_aops.c | 2 +-
3213 fs/xfs/xfs_buf.c | 4 +-
3214 include/linux/bio.h | 283 ++++++++++------
3215 include/linux/blk_types.h | 24 +-
3216 include/linux/blkdev.h | 9 +-
3217 include/linux/ceph/messenger.h | 4 +-
3218 include/linux/dm-io.h | 4 +-
3219 include/trace/events/bcache.h | 26 +-
3220 include/trace/events/block.h | 26 +-
3221 include/trace/events/f2fs.h | 4 +-
3222 kernel/power/block_io.c | 2 +-
3223 kernel/trace/blktrace.c | 15 +-
3224 mm/bounce.c | 44 ++-
3225 mm/page_io.c | 10 +-
3226 net/ceph/messenger.c | 43 +--
3227 131 files changed, 2047 insertions(+), 2545 deletions(-)
3228 create mode 100644 Documentation/block/biovecs.txt
3229 Merging device-mapper/for-next (27cafc612c3b dm snapshot: avoid snapshot space leak on crash)
3230 $ git merge device-mapper/for-next
3231 Auto-merging drivers/md/dm-thin.c
3232 Auto-merging drivers/md/dm-snap.c
3233 Auto-merging drivers/md/dm-delay.c
3234 Auto-merging drivers/md/dm-cache-target.c
3235 Auto-merging drivers/md/dm-cache-policy-mq.c
3236 Merge made by the 'recursive' strategy.
3237 Documentation/device-mapper/cache.txt | 10 +--
3238 drivers/md/dm-cache-policy-mq.c | 16 ++---
3239 drivers/md/dm-cache-target.c | 2 +-
3240 drivers/md/dm-delay.c | 52 +++++-----------
3241 drivers/md/dm-snap.c | 71 +++++++++++++++++++---
3242 drivers/md/dm-table.c | 27 +++-----
3243 drivers/md/dm-thin.c | 16 ++++-
3244 drivers/md/persistent-data/dm-space-map-metadata.c | 8 ++-
3245 8 files changed, 121 insertions(+), 81 deletions(-)
3246 Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
3247 $ git merge embedded/master
3249 Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
3250 $ git merge firmware/master
3252 Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
3253 $ git merge pcmcia/master
3255 Merging mmc/mmc-next (e395c4387c74 mmc: wbsd: Silence compiler warning)
3256 $ git merge mmc/mmc-next
3258 Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
3259 $ git merge kgdb/kgdb-next
3260 Resolved 'kernel/debug/debug_core.h' using previous resolution.
3261 Auto-merging kernel/debug/debug_core.h
3262 CONFLICT (content): Merge conflict in kernel/debug/debug_core.h
3263 Automatic merge failed; fix conflicts and then commit the result.
3265 [master b66c3d88322e] Merge remote-tracking branch 'kgdb/kgdb-next'
3266 $ git diff -M --stat --summary HEAD^..
3267 Merging slab/for-next (a8c0b0837359 Merge branch 'slab/next' into for-next)
3268 $ git merge slab/for-next
3270 Merge made by the 'recursive' strategy.
3271 Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
3272 $ git merge uclinux/for-next
3274 Merging md/for-next (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.)
3275 $ git merge md/for-next
3277 Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
3278 $ git merge mfd/master
3280 Merging mfd-lj/for-mfd-next (15eb2cd74221 mfd: cros ec: spi: Depend on OF)
3281 $ git merge mfd-lj/for-mfd-next
3282 Removing include/linux/mfd/abx500/ab8500-gpio.h
3283 Auto-merging drivers/staging/nvec/nvec.c
3284 Auto-merging drivers/pinctrl/pinctrl-abx500.h
3285 Auto-merging drivers/pinctrl/pinctrl-abx500.c
3286 Auto-merging drivers/mfd/wm5110-tables.c
3287 Auto-merging drivers/mfd/lpc_ich.c
3288 Auto-merging drivers/mfd/Kconfig
3289 Merge made by the 'recursive' strategy.
3290 .../devicetree/bindings/gpio/gpio-lp3943.txt | 37 +++
3291 Documentation/devicetree/bindings/mfd/lp3943.txt | 33 +++
3292 .../devicetree/bindings/pwm/pwm-lp3943.txt | 58 ++++
3293 arch/arm/boot/dts/tegra20-colibri-512.dtsi | 4 +-
3294 drivers/gpio/Kconfig | 8 +
3295 drivers/gpio/Makefile | 1 +
3296 drivers/gpio/gpio-lp3943.c | 242 +++++++++++++++
3297 drivers/mfd/88pm800.c | 4 +-
3298 drivers/mfd/88pm805.c | 2 +-
3299 drivers/mfd/Kconfig | 26 +-
3300 drivers/mfd/Makefile | 2 +
3301 drivers/mfd/ab8500-core.c | 16 +-
3302 drivers/mfd/ab8500-debugfs.c | 5 +-
3303 drivers/mfd/arizona-core.c | 8 +-
3304 drivers/mfd/as3722.c | 5 +-
3305 drivers/mfd/asic3.c | 4 +-
3306 drivers/mfd/cros_ec.c | 2 +-
3307 drivers/mfd/cros_ec_i2c.c | 8 +-
3308 drivers/mfd/cros_ec_spi.c | 21 +-
3309 drivers/mfd/cs5535-mfd.c | 2 +-
3310 drivers/mfd/da9052-core.c | 2 +-
3311 drivers/mfd/da9055-core.c | 2 +-
3312 drivers/mfd/da9063-core.c | 2 +-
3313 drivers/mfd/db8500-prcmu.c | 4 +-
3314 drivers/mfd/htc-pasic3.c | 2 +-
3315 drivers/mfd/intel_msic.c | 2 +-
3316 drivers/mfd/janz-cmodio.c | 2 +-
3317 drivers/mfd/jz4740-adc.c | 2 +-
3318 drivers/mfd/lp3943.c | 167 +++++++++++
3319 drivers/mfd/lp8788.c | 2 +-
3320 drivers/mfd/lpc_ich.c | 2 +-
3321 drivers/mfd/lpc_sch.c | 2 +-
3322 drivers/mfd/max14577.c | 245 +++++++++++++++
3323 drivers/mfd/max77686.c | 2 +-
3324 drivers/mfd/max77693.c | 2 +-
3325 drivers/mfd/max8907.c | 2 +-
3326 drivers/mfd/max8925-core.c | 8 +-
3327 drivers/mfd/max8997.c | 2 +-
3328 drivers/mfd/max8998.c | 4 +-
3329 drivers/mfd/mc13xxx-core.c | 5 +-
3330 drivers/mfd/mc13xxx-spi.c | 1 -
3331 drivers/mfd/omap-usb-host.c | 8 +-
3332 drivers/mfd/omap-usb-tll.c | 8 +-
3333 drivers/mfd/rc5t583.c | 2 +-
3334 drivers/mfd/rdc321x-southbridge.c | 4 +-
3335 drivers/mfd/retu-mfd.c | 6 +-
3336 drivers/mfd/rtl8411.c | 6 +-
3337 drivers/mfd/rtsx_pcr.c | 2 +-
3338 drivers/mfd/sec-core.c | 58 +++-
3339 drivers/mfd/sec-irq.c | 12 +-
3340 drivers/mfd/sm501.c | 2 +-
3341 drivers/mfd/sta2x11-mfd.c | 4 +-
3342 drivers/mfd/stmpe.c | 10 +-
3343 drivers/mfd/stmpe.h | 2 +-
3344 drivers/mfd/tc3589x.c | 4 +-
3345 drivers/mfd/tc6387xb.c | 2 +-
3346 drivers/mfd/timberdale.c | 14 +-
3347 drivers/mfd/tps6507x.c | 2 +-
3348 drivers/mfd/tps65090.c | 2 +-
3349 drivers/mfd/tps65217.c | 2 +-
3350 drivers/mfd/tps6586x.c | 52 +++-
3351 drivers/mfd/tps65910.c | 2 +-
3352 drivers/mfd/tps65912-core.c | 2 +-
3353 drivers/mfd/tps80031.c | 2 +-
3354 drivers/mfd/twl-core.c | 213 +------------
3355 drivers/mfd/viperboard.c | 2 +-
3356 drivers/mfd/vx855.c | 4 +-
3357 drivers/mfd/wm5110-tables.c | 2 +-
3358 drivers/mfd/wm831x-core.c | 14 +-
3359 drivers/mfd/wm831x-i2c.c | 8 +-
3360 drivers/mfd/wm831x-spi.c | 8 +-
3361 drivers/mfd/wm8994-core.c | 4 +-
3362 drivers/pinctrl/pinctrl-abx500.c | 37 +--
3363 drivers/pinctrl/pinctrl-abx500.h | 12 +
3364 drivers/pwm/Kconfig | 10 +
3365 drivers/pwm/Makefile | 1 +
3366 drivers/pwm/pwm-lp3943.c | 314 ++++++++++++++++++++
3367 drivers/regulator/tps6586x-regulator.c | 93 ++++--
3368 drivers/staging/nvec/nvec.c | 2 +-
3369 include/linux/mfd/abx500/ab8500-gpio.h | 33 ---
3370 include/linux/mfd/abx500/ab8500.h | 2 -
3371 include/linux/mfd/lp3943.h | 114 +++++++
3372 include/linux/mfd/max14577-private.h | 330 +++++++++++++++++++++
3373 include/linux/mfd/max14577.h | 69 +++++
3374 include/linux/mfd/tps6586x.h | 7 +
3375 85 files changed, 2002 insertions(+), 435 deletions(-)
3376 create mode 100644 Documentation/devicetree/bindings/gpio/gpio-lp3943.txt
3377 create mode 100644 Documentation/devicetree/bindings/mfd/lp3943.txt
3378 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-lp3943.txt
3379 create mode 100644 drivers/gpio/gpio-lp3943.c
3380 create mode 100644 drivers/mfd/lp3943.c
3381 create mode 100644 drivers/mfd/max14577.c
3382 create mode 100644 drivers/pwm/pwm-lp3943.c
3383 delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h
3384 create mode 100644 include/linux/mfd/lp3943.h
3385 create mode 100644 include/linux/mfd/max14577-private.h
3386 create mode 100644 include/linux/mfd/max14577.h
3387 Merging battery/master (d36240d26025 power_supply: Add power_supply notifier)
3388 $ git merge battery/master
3389 Merge made by the 'recursive' strategy.
3390 drivers/power/Kconfig | 1 +
3391 drivers/power/power_supply_core.c | 30 ++++++++++++++++++++++++------
3392 include/linux/power_supply.h | 8 ++++++++
3393 3 files changed, 33 insertions(+), 6 deletions(-)
3394 Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
3395 $ git merge fbdev/for-next
3397 Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
3398 $ git merge viafb/viafb-next
3400 Merging omap_dss2/for-next (46ac29568e63 video: vt8500: fix error handling in probe())
3401 $ git merge omap_dss2/for-next
3403 Merging regulator/for-next (3d8165b1cea0 Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/arizona', 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/stw481x-vmmc' and 'regulator/topic/tps51632' into regulator-next)
3404 $ git merge regulator/for-next
3405 Merge made by the 'recursive' strategy.
3406 drivers/mfd/pcf50633-core.c | 2 +-
3407 drivers/regulator/ab8500.c | 126 ++++-----------------------------
3408 drivers/regulator/arizona-micsupp.c | 52 +++-----------
3409 drivers/regulator/as3722-regulator.c | 2 +-
3410 drivers/regulator/core.c | 11 ++-
3411 drivers/regulator/db8500-prcmu.c | 20 +-----
3412 drivers/regulator/gpio-regulator.c | 17 ++---
3413 drivers/regulator/lp3971.c | 43 ++---------
3414 drivers/regulator/lp3972.c | 41 ++---------
3415 drivers/regulator/pcf50633-regulator.c | 2 +-
3416 drivers/regulator/pfuze100-regulator.c | 22 ++----
3417 drivers/regulator/stw481x-vmmc.c | 12 +---
3418 drivers/regulator/tps51632-regulator.c | 2 +-
3419 13 files changed, 63 insertions(+), 289 deletions(-)
3420 Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
3421 $ git merge security/next
3423 Merging selinux/master (0b1f24e6db9a selinux: pull address family directly from the request_sock struct)
3424 $ git merge selinux/master
3425 Auto-merging security/selinux/hooks.c
3426 Merge made by the 'recursive' strategy.
3427 security/selinux/hooks.c | 99 ++++++++++++++++++++++++++++---------
3428 security/selinux/include/security.h | 3 +-
3429 security/selinux/netlabel.c | 31 +++++++++++-
3430 security/selinux/ss/constraint.h | 1 +
3431 security/selinux/ss/policydb.c | 96 +++++++++++++++++++++++++++++++----
3432 security/selinux/ss/policydb.h | 11 +++++
3433 security/selinux/ss/services.c | 54 +++++++++++---------
3434 security/selinux/xfrm.c | 11 +++--
3435 8 files changed, 247 insertions(+), 59 deletions(-)
3436 Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
3437 $ git merge lblnet/master
3439 Merging watchdog/master (0a9cc5eca904 sc1200_wdt: Fix oops)
3440 $ git merge watchdog/master
3441 Resolved 'drivers/watchdog/rt2880_wdt.c' using previous resolution.
3442 Auto-merging drivers/watchdog/ux500_wdt.c
3443 Auto-merging drivers/watchdog/txx9wdt.c
3444 Auto-merging drivers/watchdog/stmp3xxx_rtc_wdt.c
3445 Auto-merging drivers/watchdog/softdog.c
3446 Auto-merging drivers/watchdog/shwdt.c
3447 Auto-merging drivers/watchdog/sc1200wdt.c
3448 Auto-merging drivers/watchdog/rt2880_wdt.c
3449 CONFLICT (add/add): Merge conflict in drivers/watchdog/rt2880_wdt.c
3450 Auto-merging drivers/watchdog/pnx4008_wdt.c
3451 Auto-merging drivers/watchdog/orion_wdt.c
3452 Auto-merging drivers/watchdog/max63xx_wdt.c
3453 Auto-merging drivers/watchdog/kempld_wdt.c
3454 Auto-merging drivers/watchdog/jz4740_wdt.c
3455 Auto-merging drivers/watchdog/ie6xx_wdt.c
3456 Auto-merging drivers/watchdog/ep93xx_wdt.c
3457 Auto-merging drivers/watchdog/bcm2835_wdt.c
3458 Auto-merging arch/arm/boot/dts/sama5d3.dtsi
3459 Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
3460 Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
3461 Automatic merge failed; fix conflicts and then commit the result.
3463 [master 0c1536233fd1] Merge remote-tracking branch 'watchdog/master'
3464 $ git diff -M --stat --summary HEAD^..
3465 .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +-
3466 arch/arm/boot/dts/at91sam9260.dtsi | 5 +
3467 arch/arm/boot/dts/at91sam9263.dtsi | 5 +
3468 arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
3469 arch/arm/boot/dts/at91sam9n12.dtsi | 5 +
3470 arch/arm/boot/dts/at91sam9x5.dtsi | 5 +
3471 arch/arm/boot/dts/kizbox.dts | 6 +
3472 arch/arm/boot/dts/sama5d3.dtsi | 5 +
3473 drivers/watchdog/at91sam9_wdt.c | 309 +++++++++++++++------
3474 drivers/watchdog/bcm2835_wdt.c | 1 -
3475 drivers/watchdog/ep93xx_wdt.c | 1 -
3476 drivers/watchdog/ie6xx_wdt.c | 1 -
3477 drivers/watchdog/jz4740_wdt.c | 1 -
3478 drivers/watchdog/kempld_wdt.c | 1 -
3479 drivers/watchdog/max63xx_wdt.c | 1 -
3480 drivers/watchdog/orion_wdt.c | 1 -
3481 drivers/watchdog/pnx4008_wdt.c | 1 -
3482 drivers/watchdog/rt2880_wdt.c | 1 -
3483 drivers/watchdog/sc1200wdt.c | 3 +-
3484 drivers/watchdog/shwdt.c | 1 -
3485 drivers/watchdog/softdog.c | 1 -
3486 drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 -
3487 drivers/watchdog/txx9wdt.c | 1 -
3488 drivers/watchdog/ux500_wdt.c | 1 -
3489 24 files changed, 289 insertions(+), 103 deletions(-)
3490 Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
3491 $ git merge dwmw2-iommu/master
3493 Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
3494 $ git merge iommu/next
3496 Merge made by the 'recursive' strategy.
3497 Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
3498 $ git merge vfio/next
3500 Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
3501 $ git merge osd/linux-next
3503 Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
3504 $ git merge jc_docs/docs-next
3506 Merging trivial/for-next (6bbdc3984efb vio: remove dangly makefile bits)
3507 $ git merge trivial/for-next
3508 Auto-merging net/netfilter/ipset/Kconfig
3509 Auto-merging net/core/dev.c
3510 Auto-merging init/Kconfig
3511 Auto-merging include/linux/tracepoint.h
3512 Auto-merging drivers/xen/Kconfig
3513 Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.h
3514 Auto-merging drivers/gpu/drm/exynos/exynos_drm_gem.c
3515 Auto-merging drivers/gpu/drm/exynos/exynos_drm_g2d.c
3516 Auto-merging drivers/devfreq/exynos/exynos4_bus.c
3517 Auto-merging drivers/char/Makefile
3518 Auto-merging drivers/block/Makefile
3519 Auto-merging arch/x86/Kconfig
3520 Auto-merging arch/arm/mach-at91/Kconfig.non_dt
3521 Auto-merging Documentation/kernel-parameters.txt
3522 Merge made by the 'recursive' strategy.
3523 Documentation/DocBook/.gitignore | 1 +
3524 Documentation/DocBook/Makefile | 5 +++--
3525 Documentation/DocBook/kernel-api.tmpl | 1 +
3526 Documentation/IRQ-domain.txt | 2 +-
3527 Documentation/email-clients.txt | 2 +-
3528 Documentation/io-mapping.txt | 2 +-
3529 Documentation/kernel-parameters.txt | 9 ++++++++-
3530 Documentation/md.txt | 2 +-
3531 Documentation/rfkill.txt | 2 +-
3532 Documentation/rt-mutex-design.txt | 2 +-
3533 Documentation/static-keys.txt | 4 ++--
3534 Documentation/x86/x86_64/boot-options.txt | 23 -----------------------
3535 arch/arm/mach-at91/Kconfig.non_dt | 2 +-
3536 arch/x86/Kconfig | 2 +-
3537 drivers/block/Makefile | 1 -
3538 drivers/cdrom/Makefile | 1 -
3539 drivers/char/Makefile | 1 -
3540 drivers/devfreq/exynos/exynos4_bus.c | 2 +-
3541 drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++--
3542 drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
3543 drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
3544 drivers/gpu/drm/exynos/exynos_drm_gem.h | 2 +-
3545 drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +-
3546 drivers/gpu/drm/exynos/exynos_drm_ipp.h | 4 ++--
3547 drivers/isdn/mISDN/Kconfig | 2 +-
3548 drivers/scsi/Kconfig | 4 ++--
3549 drivers/xen/Kconfig | 2 +-
3550 include/linux/tracepoint.h | 2 +-
3552 net/core/dev.c | 2 +-
3553 net/netfilter/ipset/Kconfig | 2 +-
3554 31 files changed, 40 insertions(+), 56 deletions(-)
3555 Merging audit/master (fc582aef7dcc Merge tag 'v3.12')
3556 $ git merge audit/master
3557 Merge made by the 'recursive' strategy.
3558 Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
3559 $ git merge fsnotify/for-next
3561 Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
3562 $ git merge devicetree/devicetree/next
3564 Merging dt-rh/for-next (1b50b0c3330e Merge branch 'for-3.14' into for-next)
3565 $ git merge dt-rh/for-next
3566 Auto-merging MAINTAINERS
3567 Merge made by the 'recursive' strategy.
3568 Documentation/devicetree/bindings/arm/gic.txt | 1 +
3570 drivers/of/base.c | 53 +++++++++++++++++++--------
3571 drivers/of/irq.c | 6 ++-
3572 4 files changed, 45 insertions(+), 19 deletions(-)
3573 Merging spi/for-next (633e9b8e9370 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/falcon', 'spi/topic/gpio', 'spi/topic/msiof', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/rcar', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink' and 'spi/topic/xcomm' into spi-next)
3574 $ git merge spi/for-next
3575 Merge made by the 'recursive' strategy.
3576 Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
3577 Documentation/spi/spi-summary | 8 +-
3578 drivers/spi/Kconfig | 11 +-
3579 drivers/spi/Makefile | 1 +
3580 drivers/spi/spi-atmel.c | 18 +-
3581 drivers/spi/spi-bcm63xx-hsspi.c | 484 ++++++++++++++++++++++
3582 drivers/spi/spi-coldfire-qspi.c | 53 +--
3583 drivers/spi/spi-davinci.c | 4 +-
3584 drivers/spi/spi-dw-pci.c | 2 +-
3585 drivers/spi/spi-falcon.c | 12 +-
3586 drivers/spi/spi-gpio.c | 8 +-
3587 drivers/spi/spi-omap-100k.c | 20 -
3588 drivers/spi/spi-omap2-mcspi.c | 38 +-
3589 drivers/spi/spi-orion.c | 4 +-
3590 drivers/spi/spi-pxa2xx-pci.c | 2 +-
3591 drivers/spi/spi-rspi.c | 43 +-
3592 drivers/spi/spi-sc18is602.c | 13 +-
3593 drivers/spi/spi-sh-msiof.c | 62 +--
3594 drivers/spi/spi-tegra114.c | 98 ++---
3595 drivers/spi/spi-tegra20-sflash.c | 22 +-
3596 drivers/spi/spi-tegra20-slink.c | 97 ++---
3597 drivers/spi/spi-topcliff-pch.c | 2 +-
3598 drivers/spi/spi-xcomm.c | 12 +-
3599 drivers/spi/spi.c | 26 +-
3600 24 files changed, 705 insertions(+), 337 deletions(-)
3601 create mode 100644 drivers/spi/spi-bcm63xx-hsspi.c
3602 Merging tip/auto-latest (c4372b1b29f2 Merge branch 'x86/urgent')
3603 $ git merge tip/auto-latest
3604 Auto-merging tools/perf/perf-completion.sh
3605 Auto-merging kernel/sched/core.c
3606 Auto-merging arch/x86/Kconfig
3607 Auto-merging arch/powerpc/kernel/setup_64.c
3608 Auto-merging arch/powerpc/Kconfig
3609 Auto-merging MAINTAINERS
3610 Auto-merging Documentation/kernel-parameters.txt
3611 Merge made by the 'recursive' strategy.
3612 Documentation/kernel-parameters.txt | 10 +
3613 Documentation/memory-barriers.txt | 42 +-
3614 Documentation/robust-futex-ABI.txt | 4 +-
3615 Documentation/x86/x86_64/mm.txt | 7 +
3617 arch/mips/ar7/setup.c | 1 -
3618 arch/mips/emma/markeins/setup.c | 3 -
3619 arch/mips/netlogic/xlp/setup.c | 1 -
3620 arch/mips/netlogic/xlr/setup.c | 1 -
3621 arch/mips/sibyte/swarm/setup.c | 2 -
3622 arch/powerpc/Kconfig | 4 +
3623 arch/powerpc/include/asm/setup.h | 1 +
3624 arch/powerpc/include/asm/uprobes.h | 5 +-
3625 arch/powerpc/kernel/setup_32.c | 3 -
3626 arch/powerpc/kernel/setup_64.c | 3 -
3627 arch/powerpc/kernel/uprobes.c | 2 +-
3628 arch/powerpc/platforms/pseries/setup.c | 2 +-
3629 arch/x86/Kconfig | 52 +-
3630 arch/x86/boot/Makefile | 2 +-
3631 arch/x86/boot/boot.h | 10 +-
3632 arch/x86/boot/compressed/Makefile | 2 +-
3633 arch/x86/boot/compressed/aslr.c | 317 ++++++++++
3634 arch/x86/boot/compressed/cmdline.c | 2 +-
3635 arch/x86/boot/compressed/cpuflags.c | 12 +
3636 arch/x86/boot/compressed/head_32.S | 10 +-
3637 arch/x86/boot/compressed/head_64.S | 16 +-
3638 arch/x86/boot/compressed/misc.c | 18 +-
3639 arch/x86/boot/compressed/misc.h | 37 +-
3640 arch/x86/boot/cpucheck.c | 100 +---
3641 arch/x86/boot/cpuflags.c | 104 ++++
3642 arch/x86/boot/cpuflags.h | 19 +
3643 arch/x86/include/asm/archrandom.h | 21 +
3644 arch/x86/include/asm/efi.h | 64 +-
3645 arch/x86/include/asm/page.h | 1 +
3646 arch/x86/include/asm/page_32.h | 4 -
3647 arch/x86/include/asm/page_64_types.h | 15 +-
3648 arch/x86/include/asm/pgtable-2level.h | 100 ++--
3649 arch/x86/include/asm/pgtable_64_types.h | 2 +-
3650 arch/x86/include/asm/pgtable_types.h | 3 +-
3651 arch/x86/kernel/cpu/Makefile | 2 +-
3652 arch/x86/kernel/cpu/perf_event_intel_rapl.c | 661 +++++++++++++++++++++
3653 arch/x86/kernel/cpu/rdrand.c | 14 -
3654 arch/x86/kernel/setup.c | 26 +
3655 arch/x86/lib/copy_user_64.S | 12 +-
3656 arch/x86/mm/hugetlbpage.c | 9 +-
3657 arch/x86/mm/init_32.c | 3 +
3658 arch/x86/mm/pageattr.c | 461 +++++++++++++-
3659 arch/x86/platform/efi/efi.c | 111 ++--
3660 arch/x86/platform/efi/efi_32.c | 9 +-
3661 arch/x86/platform/efi/efi_64.c | 109 ++++
3662 arch/x86/platform/efi/efi_stub_64.S | 54 ++
3663 arch/x86/tools/relocs.c | 20 +-
3664 include/linux/efi.h | 1 +
3665 include/linux/kernel.h | 9 +
3666 include/linux/perf_event.h | 5 +-
3667 include/linux/sched.h | 1 -
3668 include/linux/uprobes.h | 52 +-
3669 kernel/events/core.c | 1 +
3670 kernel/events/uprobes.c | 60 +-
3671 kernel/fork.c | 4 +-
3672 kernel/locking/lockdep.c | 4 +
3673 kernel/panic.c | 2 +-
3674 kernel/sched/core.c | 11 +-
3675 kernel/sched/fair.c | 17 +-
3676 kernel/sched/sched.h | 1 +
3677 kernel/softirq.c | 49 +-
3678 lib/Kconfig.debug | 9 +
3679 tools/lib/lockdep/Makefile | 251 ++++++++
3680 tools/lib/lockdep/common.c | 33 +
3681 tools/lib/lockdep/include/liblockdep/common.h | 50 ++
3682 tools/lib/lockdep/include/liblockdep/mutex.h | 70 +++
3683 tools/lib/lockdep/include/liblockdep/rwlock.h | 86 +++
3684 tools/lib/lockdep/lockdep | 3 +
3685 tools/lib/lockdep/lockdep.c | 2 +
3686 tools/lib/lockdep/lockdep_internals.h | 1 +
3687 tools/lib/lockdep/lockdep_states.h | 1 +
3688 tools/lib/lockdep/preload.c | 447 ++++++++++++++
3689 tools/lib/lockdep/rbtree.c | 1 +
3690 tools/lib/lockdep/run_tests.sh | 27 +
3691 tools/lib/lockdep/tests/AA.c | 13 +
3692 tools/lib/lockdep/tests/ABBA.c | 13 +
3693 tools/lib/lockdep/tests/ABBCCA.c | 15 +
3694 tools/lib/lockdep/tests/ABBCCDDA.c | 17 +
3695 tools/lib/lockdep/tests/ABCABC.c | 15 +
3696 tools/lib/lockdep/tests/ABCDBCDA.c | 17 +
3697 tools/lib/lockdep/tests/ABCDBDDA.c | 17 +
3698 tools/lib/lockdep/tests/WW.c | 13 +
3699 tools/lib/lockdep/tests/common.h | 12 +
3700 tools/lib/lockdep/tests/unlock_balance.c | 12 +
3701 tools/lib/lockdep/uinclude/asm/hweight.h | 3 +
3702 tools/lib/lockdep/uinclude/asm/sections.h | 3 +
3703 tools/lib/lockdep/uinclude/linux/bitops.h | 3 +
3704 tools/lib/lockdep/uinclude/linux/compiler.h | 7 +
3705 tools/lib/lockdep/uinclude/linux/debug_locks.h | 12 +
3706 tools/lib/lockdep/uinclude/linux/delay.h | 3 +
3707 tools/lib/lockdep/uinclude/linux/export.h | 7 +
3708 tools/lib/lockdep/uinclude/linux/ftrace.h | 3 +
3709 tools/lib/lockdep/uinclude/linux/gfp.h | 3 +
3710 tools/lib/lockdep/uinclude/linux/hardirq.h | 11 +
3711 tools/lib/lockdep/uinclude/linux/hash.h | 1 +
3712 tools/lib/lockdep/uinclude/linux/interrupt.h | 3 +
3713 tools/lib/lockdep/uinclude/linux/irqflags.h | 38 ++
3714 tools/lib/lockdep/uinclude/linux/kallsyms.h | 32 +
3715 tools/lib/lockdep/uinclude/linux/kern_levels.h | 25 +
3716 tools/lib/lockdep/uinclude/linux/kernel.h | 44 ++
3717 tools/lib/lockdep/uinclude/linux/kmemcheck.h | 8 +
3718 tools/lib/lockdep/uinclude/linux/linkage.h | 3 +
3719 tools/lib/lockdep/uinclude/linux/list.h | 1 +
3720 tools/lib/lockdep/uinclude/linux/lockdep.h | 55 ++
3721 tools/lib/lockdep/uinclude/linux/module.h | 6 +
3722 tools/lib/lockdep/uinclude/linux/mutex.h | 3 +
3723 tools/lib/lockdep/uinclude/linux/poison.h | 1 +
3724 tools/lib/lockdep/uinclude/linux/prefetch.h | 6 +
3725 tools/lib/lockdep/uinclude/linux/proc_fs.h | 3 +
3726 tools/lib/lockdep/uinclude/linux/rbtree.h | 1 +
3727 .../lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 +
3728 tools/lib/lockdep/uinclude/linux/rcu.h | 16 +
3729 tools/lib/lockdep/uinclude/linux/seq_file.h | 3 +
3730 tools/lib/lockdep/uinclude/linux/spinlock.h | 25 +
3731 tools/lib/lockdep/uinclude/linux/stacktrace.h | 32 +
3732 tools/lib/lockdep/uinclude/linux/stringify.h | 7 +
3733 tools/lib/lockdep/uinclude/linux/types.h | 58 ++
3734 tools/lib/lockdep/uinclude/trace/events/lock.h | 3 +
3735 tools/lib/traceevent/event-parse.c | 7 +-
3736 tools/perf/Documentation/perf-record.txt | 12 +-
3737 tools/perf/Documentation/perf-script.txt | 6 +
3738 tools/perf/Documentation/perf-timechart.txt | 26 +-
3739 tools/perf/Documentation/perf-top.txt | 5 +-
3740 tools/perf/Makefile | 7 +-
3741 tools/perf/Makefile.perf | 4 +-
3742 tools/perf/builtin-record.c | 13 +-
3743 tools/perf/builtin-script.c | 209 ++++++-
3744 tools/perf/builtin-stat.c | 114 +++-
3745 tools/perf/builtin-timechart.c | 418 ++++++++-----
3746 tools/perf/builtin-top.c | 29 +-
3747 tools/perf/builtin-trace.c | 13 +-
3748 tools/perf/{bash_completion => perf-completion.sh} | 100 +++-
3749 tools/perf/perf.h | 1 +
3750 tools/perf/tests/attr/test-record-no-inherit | 2 +-
3751 tools/perf/util/event.c | 3 +-
3752 tools/perf/util/evlist.c | 6 +-
3753 tools/perf/util/evsel.c | 7 +-
3754 tools/perf/util/evsel.h | 3 +
3755 tools/perf/util/parse-events.c | 28 +-
3756 tools/perf/util/parse-options.c | 21 +
3757 tools/perf/util/parse-options.h | 8 +
3758 tools/perf/util/pmu.c | 138 ++++-
3759 tools/perf/util/pmu.h | 3 +-
3760 tools/perf/util/session.c | 10 +-
3761 tools/perf/util/svghelper.c | 77 ++-
3762 tools/perf/util/svghelper.h | 11 +-
3763 tools/perf/util/symbol.c | 41 +-
3764 tools/perf/util/symbol.h | 4 +
3765 tools/perf/util/target.c | 11 +-
3766 tools/perf/util/target.h | 4 +-
3767 tools/perf/util/thread.h | 12 +
3768 156 files changed, 4938 insertions(+), 686 deletions(-)
3769 create mode 100644 arch/x86/boot/compressed/aslr.c
3770 create mode 100644 arch/x86/boot/compressed/cpuflags.c
3771 create mode 100644 arch/x86/boot/cpuflags.c
3772 create mode 100644 arch/x86/boot/cpuflags.h
3773 create mode 100644 arch/x86/kernel/cpu/perf_event_intel_rapl.c
3774 create mode 100644 tools/lib/lockdep/Makefile
3775 create mode 100644 tools/lib/lockdep/common.c
3776 create mode 100644 tools/lib/lockdep/include/liblockdep/common.h
3777 create mode 100644 tools/lib/lockdep/include/liblockdep/mutex.h
3778 create mode 100644 tools/lib/lockdep/include/liblockdep/rwlock.h
3779 create mode 100755 tools/lib/lockdep/lockdep
3780 create mode 100644 tools/lib/lockdep/lockdep.c
3781 create mode 100644 tools/lib/lockdep/lockdep_internals.h
3782 create mode 100644 tools/lib/lockdep/lockdep_states.h
3783 create mode 100644 tools/lib/lockdep/preload.c
3784 create mode 100644 tools/lib/lockdep/rbtree.c
3785 create mode 100644 tools/lib/lockdep/run_tests.sh
3786 create mode 100644 tools/lib/lockdep/tests/AA.c
3787 create mode 100644 tools/lib/lockdep/tests/ABBA.c
3788 create mode 100644 tools/lib/lockdep/tests/ABBCCA.c
3789 create mode 100644 tools/lib/lockdep/tests/ABBCCDDA.c
3790 create mode 100644 tools/lib/lockdep/tests/ABCABC.c
3791 create mode 100644 tools/lib/lockdep/tests/ABCDBCDA.c
3792 create mode 100644 tools/lib/lockdep/tests/ABCDBDDA.c
3793 create mode 100644 tools/lib/lockdep/tests/WW.c
3794 create mode 100644 tools/lib/lockdep/tests/common.h
3795 create mode 100644 tools/lib/lockdep/tests/unlock_balance.c
3796 create mode 100644 tools/lib/lockdep/uinclude/asm/hweight.h
3797 create mode 100644 tools/lib/lockdep/uinclude/asm/sections.h
3798 create mode 100644 tools/lib/lockdep/uinclude/linux/bitops.h
3799 create mode 100644 tools/lib/lockdep/uinclude/linux/compiler.h
3800 create mode 100644 tools/lib/lockdep/uinclude/linux/debug_locks.h
3801 create mode 100644 tools/lib/lockdep/uinclude/linux/delay.h
3802 create mode 100644 tools/lib/lockdep/uinclude/linux/export.h
3803 create mode 100644 tools/lib/lockdep/uinclude/linux/ftrace.h
3804 create mode 100644 tools/lib/lockdep/uinclude/linux/gfp.h
3805 create mode 100644 tools/lib/lockdep/uinclude/linux/hardirq.h
3806 create mode 100644 tools/lib/lockdep/uinclude/linux/hash.h
3807 create mode 100644 tools/lib/lockdep/uinclude/linux/interrupt.h
3808 create mode 100644 tools/lib/lockdep/uinclude/linux/irqflags.h
3809 create mode 100644 tools/lib/lockdep/uinclude/linux/kallsyms.h
3810 create mode 100644 tools/lib/lockdep/uinclude/linux/kern_levels.h
3811 create mode 100644 tools/lib/lockdep/uinclude/linux/kernel.h
3812 create mode 100644 tools/lib/lockdep/uinclude/linux/kmemcheck.h
3813 create mode 100644 tools/lib/lockdep/uinclude/linux/linkage.h
3814 create mode 100644 tools/lib/lockdep/uinclude/linux/list.h
3815 create mode 100644 tools/lib/lockdep/uinclude/linux/lockdep.h
3816 create mode 100644 tools/lib/lockdep/uinclude/linux/module.h
3817 create mode 100644 tools/lib/lockdep/uinclude/linux/mutex.h
3818 create mode 100644 tools/lib/lockdep/uinclude/linux/poison.h
3819 create mode 100644 tools/lib/lockdep/uinclude/linux/prefetch.h
3820 create mode 100644 tools/lib/lockdep/uinclude/linux/proc_fs.h
3821 create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree.h
3822 create mode 100644 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
3823 create mode 100644 tools/lib/lockdep/uinclude/linux/rcu.h
3824 create mode 100644 tools/lib/lockdep/uinclude/linux/seq_file.h
3825 create mode 100644 tools/lib/lockdep/uinclude/linux/spinlock.h
3826 create mode 100644 tools/lib/lockdep/uinclude/linux/stacktrace.h
3827 create mode 100644 tools/lib/lockdep/uinclude/linux/stringify.h
3828 create mode 100644 tools/lib/lockdep/uinclude/linux/types.h
3829 create mode 100644 tools/lib/lockdep/uinclude/trace/events/lock.h
3830 rename tools/perf/{bash_completion => perf-completion.sh} (65%)
3831 Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put)
3832 $ git merge edac/linux_next
3834 Merging edac-amd/for-next (c97986837cc6 Merge branch 'ras-fixes' into for-next)
3835 $ git merge edac-amd/for-next
3836 Merge made by the 'recursive' strategy.
3837 arch/x86/kernel/cpu/mcheck/mce.c | 4 +-
3838 drivers/edac/amd64_edac.c | 4 +-
3839 drivers/edac/amd76x_edac.c | 2 +-
3840 drivers/edac/e752x_edac.c | 2 +-
3841 drivers/edac/e7xxx_edac.c | 2 +-
3842 drivers/edac/i3000_edac.c | 2 +-
3843 drivers/edac/i3200_edac.c | 2 +-
3844 drivers/edac/i5000_edac.c | 2 +-
3845 drivers/edac/i5100_edac.c | 2 +-
3846 drivers/edac/i5400_edac.c | 2 +-
3847 drivers/edac/i7300_edac.c | 2 +-
3848 drivers/edac/i7core_edac.c | 2 +-
3849 drivers/edac/i82443bxgx_edac.c | 2 +-
3850 drivers/edac/i82860_edac.c | 2 +-
3851 drivers/edac/i82875p_edac.c | 2 +-
3852 drivers/edac/i82975x_edac.c | 2 +-
3853 drivers/edac/mpc85xx_edac.c | 98 +++++++++++++++++++++++++++++++++++-----
3854 drivers/edac/mpc85xx_edac.h | 7 +++
3855 drivers/edac/r82600_edac.c | 2 +-
3856 drivers/edac/sb_edac.c | 2 +-
3857 drivers/edac/x38_edac.c | 2 +-
3858 21 files changed, 116 insertions(+), 31 deletions(-)
3859 Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched() at instance deletion time)
3860 $ git merge ftrace/for-next
3862 Merging rcu/rcu/next (9dd97744fb2f Merge branches 'doc.2013.12.03a', 'fixes.2013.12.03a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.03a' into HEAD)
3863 $ git merge rcu/rcu/next
3864 Auto-merging kernel/rcu/tree_plugin.h
3865 Auto-merging MAINTAINERS
3866 Auto-merging Documentation/kernel-parameters.txt
3867 Merge made by the 'recursive' strategy.
3868 Documentation/RCU/trace.txt | 22 ++-
3869 Documentation/circular-buffers.txt | 45 +++--
3870 Documentation/kernel-parameters.txt | 9 +-
3872 include/linux/rculist.h | 4 +-
3873 include/linux/rcupdate.h | 153 ++++++++-------
3874 include/linux/rcutiny.h | 2 +-
3875 include/linux/rcutree.h | 36 ++--
3876 kernel/rcu/rcu.h | 5 +-
3877 kernel/rcu/srcu.c | 57 +++++-
3878 kernel/rcu/torture.c | 75 ++++----
3879 kernel/rcu/tree.c | 79 ++++++--
3880 kernel/rcu/tree.h | 12 +-
3881 kernel/rcu/tree_plugin.h | 89 +++++++--
3882 kernel/rcu/tree_trace.c | 3 +-
3883 kernel/rcu/update.c | 5 +
3884 tools/testing/selftests/rcutorture/.gitignore | 6 +
3885 .../selftests/rcutorture/bin/config2frag.sh | 25 +++
3886 .../selftests/rcutorture/bin/configNR_CPUS.sh | 45 +++++
3887 .../selftests/rcutorture/bin/configcheck.sh | 54 ++++++
3888 .../testing/selftests/rcutorture/bin/configinit.sh | 74 ++++++++
3889 tools/testing/selftests/rcutorture/bin/cpus2use.sh | 41 ++++
3890 .../testing/selftests/rcutorture/bin/functions.sh | 198 +++++++++++++++++++
3891 .../testing/selftests/rcutorture/bin/kvm-build.sh | 71 +++++++
3892 .../selftests/rcutorture/bin/kvm-recheck.sh | 44 +++++
3893 .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 192 +++++++++++++++++++
3894 tools/testing/selftests/rcutorture/bin/kvm.sh | 210 +++++++++++++++++++++
3895 .../selftests/rcutorture/bin/parse-build.sh | 57 ++++++
3896 .../selftests/rcutorture/bin/parse-console.sh | 41 ++++
3897 .../selftests/rcutorture/bin/parse-rcutorture.sh | 106 +++++++++++
3898 tools/testing/selftests/rcutorture/configs/CFLIST | 13 ++
3899 tools/testing/selftests/rcutorture/configs/SRCU-N | 8 +
3900 .../selftests/rcutorture/configs/SRCU-N.boot | 1 +
3901 tools/testing/selftests/rcutorture/configs/SRCU-P | 8 +
3902 .../selftests/rcutorture/configs/SRCU-P.boot | 1 +
3903 tools/testing/selftests/rcutorture/configs/TINY01 | 13 ++
3904 tools/testing/selftests/rcutorture/configs/TINY02 | 13 ++
3905 tools/testing/selftests/rcutorture/configs/TREE01 | 23 +++
3906 .../selftests/rcutorture/configs/TREE01.boot | 1 +
3907 tools/testing/selftests/rcutorture/configs/TREE02 | 26 +++
3908 tools/testing/selftests/rcutorture/configs/TREE03 | 23 +++
3909 tools/testing/selftests/rcutorture/configs/TREE04 | 25 +++
3910 .../selftests/rcutorture/configs/TREE04.boot | 1 +
3911 tools/testing/selftests/rcutorture/configs/TREE05 | 25 +++
3912 .../selftests/rcutorture/configs/TREE05.boot | 1 +
3913 tools/testing/selftests/rcutorture/configs/TREE06 | 26 +++
3914 tools/testing/selftests/rcutorture/configs/TREE07 | 24 +++
3915 tools/testing/selftests/rcutorture/configs/TREE08 | 26 +++
3916 .../testing/selftests/rcutorture/configs/TREE08-T | 26 +++
3917 tools/testing/selftests/rcutorture/configs/TREE09 | 21 +++
3918 .../selftests/rcutorture/configs/v0.0/CFLIST | 14 ++
3919 .../rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP | 18 ++
3920 .../rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp | 20 ++
3921 .../rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp | 22 +++
3922 .../rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP | 18 ++
3923 .../rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp | 22 +++
3924 .../selftests/rcutorture/configs/v0.0/NT1-nh | 23 +++
3925 .../selftests/rcutorture/configs/v0.0/NT3-NH | 20 ++
3926 .../rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP | 19 ++
3927 .../rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp | 20 ++
3928 .../rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp | 20 ++
3929 .../rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP | 22 +++
3930 .../rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp | 28 +++
3931 .../selftests/rcutorture/configs/v0.0/PT1-nh | 23 +++
3932 .../selftests/rcutorture/configs/v0.0/PT2-NH | 22 +++
3933 .../rcutorture/configs/v0.0/ver_functions.sh | 35 ++++
3934 .../selftests/rcutorture/configs/v3.12/CFLIST | 17 ++
3935 .../rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP | 19 ++
3936 .../rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp | 20 ++
3937 .../rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp | 22 +++
3938 .../rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP | 18 ++
3939 .../rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp | 22 +++
3940 .../rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp | 19 ++
3941 .../rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP | 26 +++
3942 .../rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP | 22 +++
3943 .../selftests/rcutorture/configs/v3.12/NT1-nh | 23 +++
3944 .../selftests/rcutorture/configs/v3.12/NT3-NH | 20 ++
3945 .../rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP | 20 ++
3946 .../rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp | 20 ++
3947 .../rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp | 20 ++
3948 .../rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP | 22 +++
3949 .../rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp | 28 +++
3950 .../rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp | 18 ++
3951 .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP | 30 +++
3952 .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 +++
3953 .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 +++
3954 .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp | 30 +++
3955 .../selftests/rcutorture/configs/v3.12/PT1-nh | 23 +++
3956 .../selftests/rcutorture/configs/v3.12/PT2-NH | 22 +++
3957 .../selftests/rcutorture/configs/v3.3/CFLIST | 14 ++
3958 .../rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP | 19 ++
3959 .../rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp | 20 ++
3960 .../rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp | 22 +++
3961 .../rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP | 18 ++
3962 .../rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp | 22 +++
3963 .../selftests/rcutorture/configs/v3.3/NT1-nh | 23 +++
3964 .../selftests/rcutorture/configs/v3.3/NT3-NH | 20 ++
3965 .../rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP | 20 ++
3966 .../rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp | 20 ++
3967 .../rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp | 20 ++
3968 .../rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP | 22 +++
3969 .../rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp | 28 +++
3970 .../selftests/rcutorture/configs/v3.3/PT1-nh | 23 +++
3971 .../selftests/rcutorture/configs/v3.3/PT2-NH | 22 +++
3972 .../rcutorture/configs/v3.3/ver_functions.sh | 41 ++++
3973 .../selftests/rcutorture/configs/v3.5/CFLIST | 14 ++
3974 .../rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP | 19 ++
3975 .../rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp | 20 ++
3976 .../rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp | 22 +++
3977 .../rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP | 18 ++
3978 .../rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp | 22 +++
3979 .../selftests/rcutorture/configs/v3.5/NT1-nh | 23 +++
3980 .../selftests/rcutorture/configs/v3.5/NT3-NH | 20 ++
3981 .../rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP | 20 ++
3982 .../rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp | 20 ++
3983 .../rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp | 20 ++
3984 .../rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP | 22 +++
3985 .../rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp | 28 +++
3986 .../selftests/rcutorture/configs/v3.5/PT1-nh | 23 +++
3987 .../selftests/rcutorture/configs/v3.5/PT2-NH | 22 +++
3988 .../rcutorture/configs/v3.5/ver_functions.sh | 46 +++++
3989 .../selftests/rcutorture/configs/ver_functions.sh | 46 +++++
3990 .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 40 ++++
3991 .../selftests/rcutorture/doc/TREE_RCU-Kconfig.txt | 95 ++++++++++
3992 tools/testing/selftests/rcutorture/doc/initrd.txt | 90 +++++++++
3993 .../selftests/rcutorture/doc/rcu-test-image.txt | 42 +++++
3994 126 files changed, 3767 insertions(+), 197 deletions(-)
3995 create mode 100644 tools/testing/selftests/rcutorture/.gitignore
3996 create mode 100644 tools/testing/selftests/rcutorture/bin/config2frag.sh
3997 create mode 100755 tools/testing/selftests/rcutorture/bin/configNR_CPUS.sh
3998 create mode 100755 tools/testing/selftests/rcutorture/bin/configcheck.sh
3999 create mode 100755 tools/testing/selftests/rcutorture/bin/configinit.sh
4000 create mode 100755 tools/testing/selftests/rcutorture/bin/cpus2use.sh
4001 create mode 100644 tools/testing/selftests/rcutorture/bin/functions.sh
4002 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-build.sh
4003 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
4004 create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
4005 create mode 100644 tools/testing/selftests/rcutorture/bin/kvm.sh
4006 create mode 100755 tools/testing/selftests/rcutorture/bin/parse-build.sh
4007 create mode 100755 tools/testing/selftests/rcutorture/bin/parse-console.sh
4008 create mode 100755 tools/testing/selftests/rcutorture/bin/parse-rcutorture.sh
4009 create mode 100644 tools/testing/selftests/rcutorture/configs/CFLIST
4010 create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N
4011 create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N.boot
4012 create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P
4013 create mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P.boot
4014 create mode 100644 tools/testing/selftests/rcutorture/configs/TINY01
4015 create mode 100644 tools/testing/selftests/rcutorture/configs/TINY02
4016 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01
4017 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE01.boot
4018 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE02
4019 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE03
4020 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04
4021 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE04.boot
4022 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05
4023 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE05.boot
4024 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE06
4025 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE07
4026 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08
4027 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE08-T
4028 create mode 100644 tools/testing/selftests/rcutorture/configs/TREE09
4029 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/CFLIST
4030 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP
4031 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp
4032 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp
4033 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP
4034 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp
4035 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh
4036 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH
4037 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP
4038 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp
4039 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp
4040 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP
4041 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp
4042 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh
4043 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH
4044 create mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh
4045 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/CFLIST
4046 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP
4047 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp
4048 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp
4049 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP
4050 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp
4051 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp
4052 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP
4053 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP
4054 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh
4055 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH
4056 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP
4057 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp
4058 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp
4059 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP
4060 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp
4061 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp
4062 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP
4063 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all
4064 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none
4065 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp
4066 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh
4067 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH
4068 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/CFLIST
4069 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP
4070 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp
4071 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp
4072 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP
4073 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp
4074 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh
4075 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH
4076 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP
4077 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp
4078 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp
4079 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP
4080 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp
4081 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh
4082 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH
4083 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh
4084 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/CFLIST
4085 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP
4086 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp
4087 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp
4088 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP
4089 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp
4090 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh
4091 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH
4092 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP
4093 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp
4094 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp
4095 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP
4096 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp
4097 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh
4098 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH
4099 create mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh
4100 create mode 100644 tools/testing/selftests/rcutorture/configs/ver_functions.sh
4101 create mode 100644 tools/testing/selftests/rcutorture/doc/TINY_RCU.txt
4102 create mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt
4103 create mode 100644 tools/testing/selftests/rcutorture/doc/initrd.txt
4104 create mode 100644 tools/testing/selftests/rcutorture/doc/rcu-test-image.txt
4105 Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
4106 $ git merge uprobes/for-next
4108 Merging kvm/linux-next (d6d63b51fe3b Merge tag 'kvm-s390-20131128' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next)
4109 $ git merge kvm/linux-next
4110 Auto-merging MAINTAINERS
4111 Merge made by the 'recursive' strategy.
4113 arch/s390/kvm/diag.c | 2 +-
4114 arch/s390/kvm/kvm-s390.c | 53 +++++++++++++++++++++------------------------
4115 arch/s390/kvm/kvm-s390.h | 10 ++-------
4116 arch/s390/kvm/priv.c | 4 +---
4117 arch/s390/kvm/sigp.c | 56 ++++++++++++++++++++++++++++++++++++++++++------
4118 arch/s390/kvm/trace.h | 1 +
4119 7 files changed, 79 insertions(+), 49 deletions(-)
4120 Merging kvm-arm/kvm-arm-next (ede582224231 Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next)
4121 $ git merge kvm-arm/kvm-arm-next
4123 Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as fast return)
4124 $ git merge kvm-ppc/kvm-ppc-next
4125 Merge made by the 'recursive' strategy.
4126 arch/powerpc/kvm/book3s_hv.c | 10 ++++------
4127 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 19 ++++++++++++++++++-
4128 2 files changed, 22 insertions(+), 7 deletions(-)
4129 Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
4130 $ git merge oprofile/for-next
4132 Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
4133 $ git merge fw-nohz/nohz/next
4135 Merging xen-tip/linux-next (7c2a5cd7ee0e Merge remote-tracking branch 'xentip/stable/for-linus-3.13' into linux-next)
4136 $ git merge xen-tip/linux-next
4137 Merge made by the 'recursive' strategy.
4138 arch/arm/xen/enlighten.c | 4 ++--
4139 drivers/xen/grant-table.c | 3 ++-
4140 drivers/xen/privcmd.c | 9 +++++++--
4141 3 files changed, 11 insertions(+), 5 deletions(-)
4142 Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings from DEFINE_PER_CPU())
4143 $ git merge percpu/for-next
4144 Merge made by the 'recursive' strategy.
4145 include/linux/percpu-defs.h | 1 +
4146 1 file changed, 1 insertion(+)
4147 Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
4148 $ git merge workqueues/for-next
4150 Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values)
4151 $ git merge drivers-x86/linux-next
4153 Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
4154 $ git merge chrome-platform/for-next
4155 Merge made by the 'recursive' strategy.
4156 drivers/platform/chrome/Kconfig | 14 ++
4157 drivers/platform/chrome/Makefile | 1 +
4158 drivers/platform/chrome/chromeos_laptop.c | 298 +++++++++++++++++++++---------
4159 drivers/platform/chrome/chromeos_pstore.c | 101 ++++++++++
4160 4 files changed, 323 insertions(+), 91 deletions(-)
4161 create mode 100644 drivers/platform/chrome/chromeos_pstore.c
4162 Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
4163 $ git merge sysctl/master
4165 Merging regmap/for-next (d929555edfba Merge remote-tracking branch 'regmap/topic/core' into regmap-next)
4166 $ git merge regmap/for-next
4167 Merge made by the 'recursive' strategy.
4168 drivers/base/regmap/regmap-mmio.c | 11 ++++++-----
4169 drivers/base/regmap/regmap.c | 12 ++++++++----
4170 2 files changed, 14 insertions(+), 9 deletions(-)
4171 Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
4172 $ git merge hsi/for-next
4174 Merging leds/for-next (4a87d107bfc3 leds: lp5521/5523: Remove duplicate mutex)
4175 $ git merge leds/for-next
4176 Merge made by the 'recursive' strategy.
4177 Documentation/devicetree/bindings/leds/tca6507.txt | 16 ++
4178 Documentation/leds/leds-lp55xx.txt | 10 +-
4179 drivers/leds/leds-lp5521.c | 30 ++-
4180 drivers/leds/leds-lp5523.c | 32 ++--
4181 drivers/leds/leds-lp55xx-common.c | 2 +
4182 drivers/leds/leds-tca6507.c | 204 +++++++++++----------
4183 6 files changed, 180 insertions(+), 114 deletions(-)
4184 Merging driver-core/driver-core-next (bbc780f8bab5 driver core: fix device_create() error path)
4185 $ git merge driver-core/driver-core-next
4186 Resolved 'fs/sysfs/file.c' using previous resolution.
4187 Auto-merging fs/sysfs/file.c
4188 CONFLICT (content): Merge conflict in fs/sysfs/file.c
4189 Auto-merging fs/kernfs/inode.c
4190 Automatic merge failed; fix conflicts and then commit the result.
4192 [master c2fbc96b0661] Merge remote-tracking branch 'driver-core/driver-core-next'
4193 $ git diff -M --stat --summary HEAD^..
4194 Documentation/kobject.txt | 5 +-
4195 arch/x86/kernel/microcode_amd.c | 2 +-
4196 arch/x86/kernel/microcode_intel.c | 2 +-
4197 drivers/base/core.c | 3 +-
4198 drivers/base/firmware_class.c | 86 +++-
4199 drivers/firmware/dmi-sysfs.c | 3 +-
4201 fs/kernfs/Makefile | 5 +
4202 fs/kernfs/dir.c | 1020 ++++++++++++++++++++++++++++++++++++
4203 fs/kernfs/file.c | 813 +++++++++++++++++++++++++++++
4204 fs/{sysfs => kernfs}/inode.c | 179 ++++---
4205 fs/kernfs/kernfs-internal.h | 122 +++++
4206 fs/kernfs/mount.c | 165 ++++++
4207 fs/kernfs/symlink.c | 152 ++++++
4208 fs/namespace.c | 2 +
4209 fs/sysfs/Makefile | 2 +-
4210 fs/sysfs/dir.c | 1030 +------------------------------------
4211 fs/sysfs/file.c | 929 ++++++---------------------------
4212 fs/sysfs/group.c | 59 ++-
4213 fs/sysfs/mount.c | 182 +------
4214 fs/sysfs/symlink.c | 179 +------
4215 fs/sysfs/sysfs.h | 228 +-------
4216 include/linux/firmware.h | 7 +
4217 include/linux/kernfs.h | 356 +++++++++++++
4218 include/linux/sysfs.h | 43 +-
4219 lib/kobject.c | 41 +-
4220 samples/kobject/kset-example.c | 1 +
4221 27 files changed, 3140 insertions(+), 2478 deletions(-)
4222 create mode 100644 fs/kernfs/Makefile
4223 create mode 100644 fs/kernfs/dir.c
4224 create mode 100644 fs/kernfs/file.c
4225 rename fs/{sysfs => kernfs}/inode.c (67%)
4226 create mode 100644 fs/kernfs/kernfs-internal.h
4227 create mode 100644 fs/kernfs/mount.c
4228 create mode 100644 fs/kernfs/symlink.c
4229 create mode 100644 include/linux/kernfs.h
4230 Merging tty/tty-next (acc0f67f307f tty: Halve flip buffer GFP_ATOMIC memory consumption)
4231 $ git merge tty/tty-next
4232 Auto-merging drivers/tty/n_tty.c
4233 Merge made by the 'recursive' strategy.
4234 drivers/input/serio/serport.c | 28 +++----
4235 drivers/parport/parport_serial.c | 5 --
4236 drivers/staging/fwserial/Kconfig | 20 +++++
4237 drivers/staging/fwserial/fwserial.c | 151 ++++++++++--------------------------
4238 drivers/staging/fwserial/fwserial.h | 24 +-----
4239 drivers/tty/n_gsm.c | 44 ++++++++---
4240 drivers/tty/n_r3964.c | 2 +-
4241 drivers/tty/n_tty.c | 87 ++++++++++-----------
4242 drivers/tty/rocket.c | 2 +-
4243 drivers/tty/serial/8250/8250_dw.c | 8 --
4244 drivers/tty/serial/amba-pl010.c | 15 ++--
4245 drivers/tty/serial/amba-pl011.c | 21 +++--
4246 drivers/tty/serial/imx.c | 8 ++
4247 drivers/tty/serial/mxs-auart.c | 9 ++-
4248 drivers/tty/serial/pch_uart.c | 3 +-
4249 drivers/tty/serial/rp2.c | 2 +-
4250 drivers/tty/serial/serial_core.c | 8 +-
4251 drivers/tty/tty_buffer.c | 110 ++++++++++++++------------
4252 include/linux/amba/serial.h | 1 -
4253 include/linux/tty.h | 7 +-
4254 include/linux/tty_flip.h | 11 ++-
4255 include/linux/tty_ldisc.h | 6 +-
4256 22 files changed, 271 insertions(+), 301 deletions(-)
4257 Merging usb/usb-next (756a2eed67e6 usb: wusbcore: set packet count correctly on isoc transfers)
4258 $ git merge usb/usb-next
4259 Auto-merging drivers/usb/wusbcore/security.c
4260 Auto-merging drivers/usb/host/xhci-ring.c
4261 Auto-merging drivers/usb/host/r8a66597-hcd.c
4262 Auto-merging drivers/usb/host/ohci-pxa27x.c
4263 Auto-merging drivers/usb/core/hub.c
4264 Auto-merging drivers/usb/class/cdc-acm.c
4265 Auto-merging drivers/usb/chipidea/core.c
4266 Merge made by the 'recursive' strategy.
4267 drivers/staging/dwc2/hcd.c | 2 +
4268 drivers/staging/octeon-usb/octeon-hcd.c | 1 +
4269 drivers/staging/ozwpan/ozhcd.c | 2 +
4270 drivers/usb/atm/usbatm.c | 8 +-
4271 drivers/usb/c67x00/c67x00-hcd.c | 2 +
4272 drivers/usb/chipidea/Makefile | 2 +-
4273 drivers/usb/chipidea/ci_hdrc_pci.c | 2 +-
4274 drivers/usb/chipidea/core.c | 3 +-
4275 drivers/usb/chipidea/usbmisc_imx.c | 46 +++++++
4276 drivers/usb/class/cdc-acm.c | 116 ++++++++++++++++--
4277 drivers/usb/class/cdc-acm.h | 3 +
4278 drivers/usb/core/config.c | 7 --
4279 drivers/usb/core/driver.c | 4 +-
4280 drivers/usb/core/hcd-pci.c | 1 +
4281 drivers/usb/core/hcd.c | 38 ++++--
4282 drivers/usb/core/hub.c | 39 ++----
4283 drivers/usb/core/quirks.c | 3 -
4284 drivers/usb/core/urb.c | 4 +-
4285 drivers/usb/dwc3/dwc3-pci.c | 2 +-
4286 drivers/usb/gadget/amd5536udc.c | 2 +-
4287 drivers/usb/gadget/fsl_qe_udc.c | 2 +-
4288 drivers/usb/gadget/fsl_udc_core.c | 2 +-
4289 drivers/usb/gadget/pch_udc.c | 2 +-
4290 drivers/usb/host/Makefile | 2 -
4291 drivers/usb/host/ehci-atmel.c | 1 +
4292 drivers/usb/host/ehci-dbg.c | 10 +-
4293 drivers/usb/host/ehci-exynos.c | 1 +
4294 drivers/usb/host/ehci-fsl.c | 3 +-
4295 drivers/usb/host/ehci-grlib.c | 1 +
4296 drivers/usb/host/ehci-hcd.c | 14 +--
4297 drivers/usb/host/ehci-hub.c | 6 +-
4298 drivers/usb/host/ehci-mv.c | 3 +-
4299 drivers/usb/host/ehci-mxc.c | 1 +
4300 drivers/usb/host/ehci-octeon.c | 1 +
4301 drivers/usb/host/ehci-omap.c | 1 +
4302 drivers/usb/host/ehci-orion.c | 1 +
4303 drivers/usb/host/ehci-platform.c | 1 +
4304 drivers/usb/host/ehci-pmcmsp.c | 4 +-
4305 drivers/usb/host/ehci-ppc-of.c | 1 +
4306 drivers/usb/host/ehci-ps3.c | 1 +
4307 drivers/usb/host/ehci-q.c | 4 +-
4308 drivers/usb/host/ehci-sead3.c | 1 +
4309 drivers/usb/host/ehci-sh.c | 1 +
4310 drivers/usb/host/ehci-spear.c | 1 +
4311 drivers/usb/host/ehci-tegra.c | 1 +
4312 drivers/usb/host/ehci-tilegx.c | 1 +
4313 drivers/usb/host/ehci-w90x900.c | 1 +
4314 drivers/usb/host/ehci-xilinx-of.c | 4 +-
4315 drivers/usb/host/ehci.h | 8 +-
4316 drivers/usb/host/fhci-hcd.c | 2 +
4317 drivers/usb/host/fotg210-hcd.c | 96 +++------------
4318 drivers/usb/host/fotg210.h | 8 --
4319 drivers/usb/host/fusbh200-hcd.c | 98 ++-------------
4320 drivers/usb/host/fusbh200.h | 12 --
4321 drivers/usb/host/hwa-hc.c | 23 ++--
4322 drivers/usb/host/imx21-dbg.c | 4 +
4323 drivers/usb/host/imx21-hcd.c | 7 +-
4324 drivers/usb/host/imx21-hcd.h | 4 +
4325 drivers/usb/host/isp116x-hcd.c | 4 +-
4326 drivers/usb/host/isp1362-hcd.c | 4 +-
4327 drivers/usb/host/isp1760-hcd.c | 1 +
4328 drivers/usb/host/ohci-at91.c | 15 ++-
4329 drivers/usb/host/ohci-da8xx.c | 18 ++-
4330 drivers/usb/host/ohci-dbg.c | 69 -----------
4331 drivers/usb/host/ohci-exynos.c | 23 ++--
4332 drivers/usb/host/ohci-hcd.c | 29 ++---
4333 drivers/usb/host/ohci-hub.c | 6 +-
4334 drivers/usb/host/ohci-jz4740.c | 1 +
4335 drivers/usb/host/ohci-nxp.c | 4 +-
4336 drivers/usb/host/ohci-octeon.c | 2 +
4337 drivers/usb/host/ohci-omap.c | 1 +
4338 drivers/usb/host/ohci-omap3.c | 1 +
4339 drivers/usb/host/ohci-platform.c | 2 +
4340 drivers/usb/host/ohci-ppc-of.c | 4 +-
4341 drivers/usb/host/ohci-ps3.c | 1 +
4342 drivers/usb/host/ohci-pxa27x.c | 4 +-
4343 drivers/usb/host/ohci-q.c | 12 +-
4344 drivers/usb/host/ohci-s3c2410.c | 22 +---
4345 drivers/usb/host/ohci-sa1111.c | 4 +-
4346 drivers/usb/host/ohci-sm501.c | 1 +
4347 drivers/usb/host/ohci-spear.c | 16 ++-
4348 drivers/usb/host/ohci-tilegx.c | 1 +
4349 drivers/usb/host/ohci-tmio.c | 1 +
4350 drivers/usb/host/ohci.h | 13 +-
4351 drivers/usb/host/oxu210hp-hcd.c | 5 +
4352 drivers/usb/host/r8a66597-hcd.c | 3 +-
4353 drivers/usb/host/sl811-hcd.c | 2 +
4354 drivers/usb/host/u132-hcd.c | 3 +-
4355 drivers/usb/host/uhci-debug.c | 4 +-
4356 drivers/usb/host/uhci-grlib.c | 1 +
4357 drivers/usb/host/uhci-hcd.c | 44 ++++---
4358 drivers/usb/host/uhci-pci.c | 2 +-
4359 drivers/usb/host/uhci-platform.c | 1 +
4360 drivers/usb/host/whci/hcd.c | 1 +
4361 drivers/usb/host/xhci-dbg.c | 42 +++----
4362 drivers/usb/host/xhci-hub.c | 106 ++++++++--------
4363 drivers/usb/host/xhci-mem.c | 68 +++++------
4364 drivers/usb/host/xhci-plat.c | 1 +
4365 drivers/usb/host/xhci-ring.c | 36 +++---
4366 drivers/usb/host/xhci-trace.h | 6 +-
4367 drivers/usb/host/xhci.c | 173 +++++++++++++-------------
4368 drivers/usb/host/xhci.h | 54 ++-------
4369 drivers/usb/misc/usbtest.c | 17 ++-
4370 drivers/usb/musb/musb_host.c | 1 +
4371 drivers/usb/phy/phy-msm-usb.c | 1 +
4372 drivers/usb/phy/phy-mv-usb.c | 6 +-
4373 drivers/usb/renesas_usbhs/mod_host.c | 1 +
4374 drivers/usb/storage/protocol.c | 80 ++++--------
4375 drivers/usb/wusbcore/cbaf.c | 8 +-
4376 drivers/usb/wusbcore/security.c | 22 ++--
4377 drivers/usb/wusbcore/wa-hc.h | 7 +-
4378 drivers/usb/wusbcore/wa-rpipe.c | 10 +-
4379 drivers/usb/wusbcore/wa-xfer.c | 209 ++++++++++++++++++++------------
4380 drivers/uwb/umc-bus.c | 2 +-
4381 include/linux/scatterlist.h | 1 +
4382 include/linux/usb/hcd.h | 1 +
4383 include/linux/uwb/umc.h | 2 +-
4384 lib/scatterlist.c | 3 +-
4385 118 files changed, 878 insertions(+), 925 deletions(-)
4386 Merging usb-gadget/next (c6d7641470fe usb: dwc3: omap: remove unnecessary lock)
4387 $ git merge usb-gadget/next
4388 Auto-merging include/linux/usb/otg-fsm.h
4389 Auto-merging drivers/usb/phy/phy-mxs-usb.c
4390 Auto-merging drivers/usb/musb/musb_host.c
4391 Auto-merging drivers/usb/musb/musb_core.c
4392 Auto-merging drivers/usb/gadget/zero.c
4393 Auto-merging drivers/usb/gadget/composite.c
4394 Auto-merging drivers/usb/gadget/Kconfig
4395 Merge made by the 'recursive' strategy.
4396 .../ABI/testing/configfs-usb-gadget-loopback | 8 +
4397 .../ABI/testing/configfs-usb-gadget-sourcesink | 12 +
4398 Documentation/ABI/testing/sysfs-platform-tahvo-usb | 16 +
4399 arch/arm/mach-omap1/include/mach/usb.h | 38 +-
4400 drivers/usb/dwc3/dwc3-omap.c | 12 +-
4401 drivers/usb/gadget/Kconfig | 13 +
4402 drivers/usb/gadget/Makefile | 2 +-
4403 drivers/usb/gadget/composite.c | 16 +-
4404 drivers/usb/gadget/epautoconf.c | 2 +-
4405 drivers/usb/gadget/f_hid.c | 18 +-
4406 drivers/usb/gadget/f_loopback.c | 140 ++++++-
4407 drivers/usb/gadget/f_midi.c | 22 +-
4408 drivers/usb/gadget/f_sourcesink.c | 341 ++++++++++++++-
4409 drivers/usb/gadget/g_zero.h | 24 +-
4410 drivers/usb/gadget/goku_udc.c | 12 +-
4411 drivers/usb/gadget/r8a66597-udc.c | 6 +-
4412 drivers/usb/gadget/u_ether.c | 2 +-
4413 drivers/usb/gadget/u_ether.h | 2 +-
4414 drivers/usb/gadget/u_f.c | 32 ++
4415 drivers/usb/gadget/u_f.h | 26 ++
4416 drivers/usb/gadget/zero.c | 8 +-
4417 drivers/usb/musb/musb_core.c | 25 +-
4418 drivers/usb/musb/musb_dsps.c | 117 +++++-
4419 drivers/usb/musb/musb_host.c | 9 +-
4420 drivers/usb/musb/musb_host.h | 4 +
4421 drivers/usb/musb/musb_virthub.c | 4 +-
4422 drivers/usb/phy/Kconfig | 35 +-
4423 drivers/usb/phy/Makefile | 6 +-
4424 drivers/usb/phy/phy-fsl-usb.c | 7 +-
4425 drivers/usb/phy/phy-fsl-usb.h | 2 +-
4426 drivers/usb/phy/phy-fsm-usb.c | 10 +-
4427 drivers/usb/phy/phy-mxs-usb.c | 11 +-
4428 drivers/usb/phy/phy-omap-otg.c | 169 ++++++++
4429 drivers/usb/phy/phy-tahvo.c | 463 +++++++++++++++++++++
4430 include/linux/platform_data/usb-omap1.h | 53 +++
4431 include/linux/usb/musb.h | 3 +
4432 .../phy-fsm-usb.h => include/linux/usb/otg-fsm.h | 10 +-
4433 37 files changed, 1540 insertions(+), 140 deletions(-)
4434 create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-loopback
4435 create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-sourcesink
4436 create mode 100644 Documentation/ABI/testing/sysfs-platform-tahvo-usb
4437 create mode 100644 drivers/usb/gadget/u_f.c
4438 create mode 100644 drivers/usb/gadget/u_f.h
4439 create mode 100644 drivers/usb/phy/phy-omap-otg.c
4440 create mode 100644 drivers/usb/phy/phy-tahvo.c
4441 create mode 100644 include/linux/platform_data/usb-omap1.h
4442 rename drivers/usb/phy/phy-fsm-usb.h => include/linux/usb/otg-fsm.h (96%)
4443 $ git reset --hard HEAD^
4444 HEAD is now at a6adf507bfb8 Merge remote-tracking branch 'usb/usb-next'
4445 Merging next-20131206 version of usb-gadget
4446 $ git merge -m next-20131206/usb-gadget 989c78dd56307c85f710533130a2a464f6f3c5ae
4447 Merge made by the 'recursive' strategy.
4448 drivers/usb/gadget/r8a66597-udc.c | 6 +++---
4449 1 file changed, 3 insertions(+), 3 deletions(-)
4450 Merging staging/staging-next (99ec297ad6d2 staging: btmtk_usb: remove driver)
4451 $ git merge staging/staging-next
4452 Resolved 'include/linux/hid-sensor-ids.h' using previous resolution.
4453 Auto-merging include/linux/hid-sensor-ids.h
4454 CONFLICT (content): Merge conflict in include/linux/hid-sensor-ids.h
4455 Removing drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
4456 Removing drivers/staging/lustre/lustre/ptlrpc/llog_server.c
4457 Removing drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
4458 Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
4459 Removing drivers/staging/lustre/lustre/libcfs/lwt.c
4460 Removing drivers/staging/lustre/lustre/include/lustre/lustreapi.h
4461 Removing drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
4462 Removing drivers/staging/lustre/lustre/include/lu_target.h
4463 Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
4464 Auto-merging drivers/staging/dwc2/hcd.c
4465 Removing drivers/staging/btmtk_usb/btmtk_usb.h
4466 Removing drivers/staging/btmtk_usb/btmtk_usb.c
4467 Removing drivers/staging/btmtk_usb/TODO
4468 Removing drivers/staging/btmtk_usb/README
4469 Removing drivers/staging/btmtk_usb/Makefile
4470 Removing drivers/staging/btmtk_usb/Kconfig
4471 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
4472 Automatic merge failed; fix conflicts and then commit the result.
4474 [master 9eb3b46188c1] Merge remote-tracking branch 'staging/staging-next'
4475 $ git diff -M --stat --summary HEAD^..
4476 .../devicetree/bindings/iio/light/tsl2563.txt | 19 +
4477 .../bindings/iio/magnetometer/hmc5843.txt | 17 +
4478 Documentation/devicetree/bindings/staging/dwc2.txt | 4 +-
4479 .../devicetree/bindings/vendor-prefixes.txt | 1 +
4480 Documentation/driver-model/devres.txt | 2 +
4481 Documentation/vme_api.txt | 12 +-
4482 drivers/iio/accel/hid-sensor-accel-3d.c | 12 +
4483 drivers/iio/adc/mcp3422.c | 9 +-
4484 drivers/iio/adc/viperboard_adc.c | 20 +-
4485 drivers/iio/dac/ad5421.c | 12 +-
4486 drivers/iio/dac/ad5755.c | 12 +-
4487 drivers/iio/gyro/adis16130.c | 9 +-
4488 drivers/iio/gyro/adxrs450.c | 14 +-
4489 drivers/iio/gyro/hid-sensor-gyro-3d.c | 11 +
4490 drivers/iio/industrialio-core.c | 101 +
4491 drivers/iio/industrialio-event.c | 6 +
4492 drivers/iio/industrialio-trigger.c | 28 +-
4493 drivers/iio/light/hid-sensor-als.c | 11 +
4494 drivers/iio/light/tsl2563.c | 4 +
4495 drivers/iio/light/vcnl4000.c | 9 +-
4496 drivers/iio/magnetometer/hid-sensor-magn-3d.c | 12 +
4497 drivers/iio/pressure/Kconfig | 12 +
4498 drivers/iio/pressure/Makefile | 1 +
4499 drivers/iio/pressure/mpl3115.c | 329 ++
4500 drivers/staging/Kconfig | 4 +-
4501 drivers/staging/Makefile | 2 +-
4502 drivers/staging/android/alarm-dev.c | 8 +-
4503 drivers/staging/android/sync.h | 50 +-
4504 drivers/staging/bcm/Bcmchar.c | 136 +-
4505 drivers/staging/bcm/DDRInit.c | 1501 ++++---
4506 drivers/staging/btmtk_usb/Kconfig | 11 -
4507 drivers/staging/btmtk_usb/Makefile | 1 -
4508 drivers/staging/btmtk_usb/README | 14 -
4509 drivers/staging/btmtk_usb/TODO | 10 -
4510 drivers/staging/btmtk_usb/btmtk_usb.c | 1810 --------
4511 drivers/staging/btmtk_usb/btmtk_usb.h | 138 -
4512 drivers/staging/ced1401/ced_ioc.c | 2 +-
4513 drivers/staging/comedi/Makefile | 2 +
4514 drivers/staging/comedi/comedi_buf.c | 99 +-
4515 drivers/staging/comedi/comedi_fops.c | 488 ++-
4516 drivers/staging/comedi/comedi_internal.h | 4 +
4517 drivers/staging/comedi/comedidev.h | 39 +-
4518 drivers/staging/comedi/drivers.c | 14 +-
4519 drivers/staging/comedi/drivers/8255_pci.c | 2 +-
4520 drivers/staging/comedi/drivers/Makefile | 1 +
4521 .../comedi/drivers/addi-data/hwdrv_apci3120.c | 6 +-
4522 .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +-
4523 drivers/staging/comedi/drivers/addi_apci_035.c | 2 +-
4524 drivers/staging/comedi/drivers/addi_apci_1032.c | 2 +-
4525 drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
4526 drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +-
4527 drivers/staging/comedi/drivers/addi_apci_1564.c | 2 +-
4528 drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +-
4529 drivers/staging/comedi/drivers/addi_apci_2032.c | 2 +-
4530 drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +-
4531 drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
4532 drivers/staging/comedi/drivers/addi_apci_3200.c | 2 +-
4533 drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +-
4534 drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +-
4535 drivers/staging/comedi/drivers/adl_pci6208.c | 2 +-
4536 drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +-
4537 drivers/staging/comedi/drivers/adl_pci8164.c | 2 +-
4538 drivers/staging/comedi/drivers/adl_pci9111.c | 33 +-
4539 drivers/staging/comedi/drivers/adl_pci9118.c | 47 +-
4540 drivers/staging/comedi/drivers/adq12b.c | 2 -
4541 drivers/staging/comedi/drivers/adv_pci1710.c | 39 +-
4542 drivers/staging/comedi/drivers/adv_pci1723.c | 2 +-
4543 drivers/staging/comedi/drivers/adv_pci1724.c | 2 +-
4544 drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +-
4545 .../staging/comedi/drivers/amplc_dio200_common.c | 2 +-
4546 drivers/staging/comedi/drivers/amplc_dio200_pci.c | 2 +-
4547 drivers/staging/comedi/drivers/amplc_pc236.c | 4 +-
4548 drivers/staging/comedi/drivers/amplc_pci224.c | 18 +-
4549 drivers/staging/comedi/drivers/amplc_pci230.c | 81 +-
4550 drivers/staging/comedi/drivers/amplc_pci263.c | 2 +-
4551 drivers/staging/comedi/drivers/c6xdigio.c | 54 -
4552 drivers/staging/comedi/drivers/cb_pcidas.c | 2 +-
4553 drivers/staging/comedi/drivers/cb_pcidas64.c | 128 +-
4554 drivers/staging/comedi/drivers/cb_pcidda.c | 2 +-
4555 drivers/staging/comedi/drivers/cb_pcimdas.c | 19 +-
4556 drivers/staging/comedi/drivers/cb_pcimdda.c | 2 +-
4557 drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +-
4558 drivers/staging/comedi/drivers/daqboard2000.c | 2 +-
4559 drivers/staging/comedi/drivers/das08_pci.c | 2 +-
4560 drivers/staging/comedi/drivers/das16m1.c | 83 +-
4561 drivers/staging/comedi/drivers/das1800.c | 88 +-
4562 drivers/staging/comedi/drivers/das6402.c | 9 -
4563 drivers/staging/comedi/drivers/dmm32at.c | 68 +-
4564 drivers/staging/comedi/drivers/dt2801.c | 37 +-
4565 drivers/staging/comedi/drivers/dt2811.c | 101 +-
4566 drivers/staging/comedi/drivers/dt2814.c | 70 +-
4567 drivers/staging/comedi/drivers/dt2815.c | 19 +-
4568 drivers/staging/comedi/drivers/dt282x.c | 140 +-
4569 drivers/staging/comedi/drivers/dt3000.c | 54 +-
4570 drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +-
4571 drivers/staging/comedi/drivers/fl512.c | 2 -
4572 drivers/staging/comedi/drivers/gsc_hpdi.c | 80 +-
4573 drivers/staging/comedi/drivers/icp_multi.c | 2 +-
4574 drivers/staging/comedi/drivers/jr3_pci.c | 2 +-
4575 drivers/staging/comedi/drivers/ke_counter.c | 2 +-
4576 drivers/staging/comedi/drivers/me4000.c | 39 +-
4577 drivers/staging/comedi/drivers/me_daq.c | 2 +-
4578 drivers/staging/comedi/drivers/mite.c | 145 +-
4579 drivers/staging/comedi/drivers/mite.h | 12 -
4580 drivers/staging/comedi/drivers/mpc624.c | 19 +-
4581 drivers/staging/comedi/drivers/ni_6527.c | 2 +-
4582 drivers/staging/comedi/drivers/ni_65xx.c | 7 +-
4583 drivers/staging/comedi/drivers/ni_660x.c | 2 +-
4584 drivers/staging/comedi/drivers/ni_670x.c | 2 +-
4585 drivers/staging/comedi/drivers/ni_at_a2150.c | 104 +-
4586 drivers/staging/comedi/drivers/ni_atmio.c | 15 -
4587 drivers/staging/comedi/drivers/ni_atmio16d.c | 44 +-
4588 drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +-
4589 drivers/staging/comedi/drivers/ni_mio_common.c | 157 +-
4590 drivers/staging/comedi/drivers/ni_mio_cs.c | 2 -
4591 drivers/staging/comedi/drivers/ni_pcidio.c | 179 +-
4592 drivers/staging/comedi/drivers/ni_pcimio.c | 29 +-
4593 drivers/staging/comedi/drivers/ni_tio.c | 1 -
4594 drivers/staging/comedi/drivers/pcl812.c | 82 +-
4595 drivers/staging/comedi/drivers/pcl816.c | 174 +-
4596 drivers/staging/comedi/drivers/pcl818.c | 145 +-
4597 drivers/staging/comedi/drivers/pcm3724.c | 6 -
4598 drivers/staging/comedi/drivers/pcmmio.c | 40 +-
4599 drivers/staging/comedi/drivers/pcmuio.c | 428 +-
4600 drivers/staging/comedi/drivers/plx9080.h | 13 +-
4601 drivers/staging/comedi/drivers/rtd520.c | 7 +-
4602 drivers/staging/comedi/drivers/s626.c | 19 +-
4603 drivers/staging/comedi/drivers/skel.c | 2 +-
4604 drivers/staging/comedi/drivers/unioxx5.c | 68 +-
4605 drivers/staging/comedi/kcomedilib/Makefile | 2 +
4606 .../staging/comedi/kcomedilib/kcomedilib_main.c | 74 +-
4607 drivers/staging/comedi/proc.c | 6 +-
4608 drivers/staging/comedi/range.c | 9 +-
4609 drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 +-
4610 drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
4611 drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
4612 drivers/staging/crystalhd/crystalhd_fw_if.h | 2 +-
4613 drivers/staging/crystalhd/crystalhd_hw.c | 2 +-
4614 drivers/staging/crystalhd/crystalhd_hw.h | 6 +-
4615 drivers/staging/crystalhd/crystalhd_lnx.c | 2 +-
4616 drivers/staging/crystalhd/crystalhd_lnx.h | 2 +-
4617 drivers/staging/crystalhd/crystalhd_misc.c | 4 +-
4618 drivers/staging/crystalhd/crystalhd_misc.h | 2 +-
4619 drivers/staging/cxt1e1/comet.c | 60 +-
4620 drivers/staging/cxt1e1/comet.h | 601 +--
4621 drivers/staging/cxt1e1/functions.c | 2 +-
4622 drivers/staging/cxt1e1/musycc.c | 4 +-
4623 drivers/staging/cxt1e1/pmcc4_drv.c | 10 +-
4624 drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
4625 drivers/staging/cxt1e1/sbeid.c | 323 +-
4626 drivers/staging/dgnc/dgnc_trace.c | 18 +-
4627 drivers/staging/dgrp/dgrp_net_ops.c | 330 +-
4628 drivers/staging/dwc2/core.c | 378 +-
4629 drivers/staging/dwc2/core.h | 62 +-
4630 drivers/staging/dwc2/core_intr.c | 10 +-
4631 drivers/staging/dwc2/hcd.c | 22 +-
4632 drivers/staging/dwc2/hcd.h | 4 +-
4633 drivers/staging/dwc2/hcd_ddma.c | 8 +-
4634 drivers/staging/dwc2/hcd_intr.c | 6 +-
4635 drivers/staging/dwc2/hcd_queue.c | 195 +-
4636 drivers/staging/dwc2/pci.c | 2 +-
4637 drivers/staging/dwc2/platform.c | 60 +-
4638 drivers/staging/et131x/et131x.c | 449 +-
4639 drivers/staging/et131x/et131x.h | 40 -
4640 drivers/staging/ft1000/ft1000-pcmcia/boot.h | 304 +-
4641 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 766 ++--
4642 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +
4643 .../staging/ft1000/ft1000-usb/ft1000_download.c | 132 +-
4644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1308 +++---
4645 drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +-
4646 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 4 +-
4647 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 5 -
4648 drivers/staging/gdm724x/gdm_lte.c | 44 +-
4649 drivers/staging/gdm724x/gdm_mux.c | 8 +-
4650 drivers/staging/gdm724x/gdm_usb.c | 40 +-
4651 drivers/staging/iio/accel/adis16220_core.c | 7 +-
4652 drivers/staging/iio/adc/ad7816.c | 12 +-
4653 drivers/staging/iio/adc/lpc32xx_adc.c | 12 +-
4654 drivers/staging/iio/addac/adt7316-i2c.c | 6 -
4655 drivers/staging/iio/addac/adt7316-spi.c | 6 -
4656 drivers/staging/iio/addac/adt7316.c | 12 +-
4657 drivers/staging/iio/addac/adt7316.h | 1 -
4658 drivers/staging/iio/gyro/adis16060_core.c | 10 +-
4659 drivers/staging/iio/light/isl29018.c | 13 +-
4660 drivers/staging/iio/magnetometer/hmc5843.c | 7 +
4661 drivers/staging/iio/resolver/ad2s1200.c | 10 +-
4662 drivers/staging/imx-drm/Kconfig | 6 +
4663 drivers/staging/imx-drm/Makefile | 1 +
4664 drivers/staging/imx-drm/imx-drm-core.c | 4 +-
4665 drivers/staging/imx-drm/imx-hdmi.c | 1916 +++++++++
4666 drivers/staging/imx-drm/imx-hdmi.h | 1032 +++++
4667 drivers/staging/imx-drm/imx-ldb.c | 5 +-
4668 drivers/staging/keucr/smil.h | 6 -
4669 drivers/staging/keucr/smilmain.c | 99 +-
4670 drivers/staging/keucr/smilsub.c | 37 +-
4671 drivers/staging/keucr/smscsi.c | 28 +-
4672 .../staging/lustre/include/linux/libcfs/curproc.h | 1 -
4673 .../staging/lustre/include/linux/libcfs/libcfs.h | 2 -
4674 .../lustre/include/linux/libcfs/libcfs_ioctl.h | 63 +-
4675 .../lustre/include/linux/libcfs/linux/kp30.h | 149 +-
4676 .../lustre/include/linux/libcfs/linux/libcfs.h | 1 -
4677 .../lustre/include/linux/libcfs/linux/linux-fs.h | 92 -
4678 drivers/staging/lustre/include/linux/lnet/types.h | 11 -
4679 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 1 -
4680 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 3 -
4681 .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 358 +-
4682 .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 -
4683 .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 6 -
4684 .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 307 --
4685 .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 124 +-
4686 drivers/staging/lustre/lnet/lnet/acceptor.c | 16 +-
4687 drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +-
4688 drivers/staging/lustre/lnet/lnet/lib-move.c | 4 +-
4689 drivers/staging/lustre/lnet/lnet/lib-msg.c | 8 +-
4690 drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +-
4691 drivers/staging/lustre/lnet/lnet/module.c | 4 +-
4692 drivers/staging/lustre/lnet/lnet/router.c | 44 +-
4693 drivers/staging/lustre/lnet/lnet/router_proc.c | 14 -
4694 drivers/staging/lustre/lnet/selftest/brw_test.c | 7 +-
4695 drivers/staging/lustre/lnet/selftest/conctl.c | 56 +-
4696 drivers/staging/lustre/lnet/selftest/conrpc.c | 2 +-
4697 drivers/staging/lustre/lnet/selftest/console.c | 103 +-
4698 drivers/staging/lustre/lnet/selftest/console.h | 6 +-
4699 drivers/staging/lustre/lnet/selftest/framework.c | 8 +-
4700 drivers/staging/lustre/lnet/selftest/ping_test.c | 3 +-
4701 drivers/staging/lustre/lnet/selftest/rpc.c | 2 -
4702 drivers/staging/lustre/lnet/selftest/selftest.h | 3 -
4703 drivers/staging/lustre/lnet/selftest/timer.c | 11 +-
4704 drivers/staging/lustre/lustre/fid/Makefile | 3 +-
4705 drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 -
4706 drivers/staging/lustre/lustre/fld/Makefile | 3 +-
4707 drivers/staging/lustre/lustre/fld/fld_internal.h | 1 -
4708 drivers/staging/lustre/lustre/fld/fld_request.c | 7 +-
4709 drivers/staging/lustre/lustre/fld/lproc_fld.c | 3 -
4710 drivers/staging/lustre/lustre/include/cl_object.h | 6 +-
4711 drivers/staging/lustre/lustre/include/dt_object.h | 2 +-
4712 .../lustre/lustre/include/linux/lustre_acl.h | 18 +-
4713 .../lustre/lustre/include/linux/lustre_intent.h | 2 +-
4714 .../lustre/lustre/include/linux/lustre_lite.h | 1 +
4715 .../staging/lustre/lustre/include/lprocfs_status.h | 8 +-
4716 drivers/staging/lustre/lustre/include/lu_object.h | 19 -
4717 drivers/staging/lustre/lustre/include/lu_target.h | 91 -
4718 .../lustre/lustre/include/lustre/liblustreapi.h | 43 -
4719 .../lustre/lustre/include/lustre/lustre_idl.h | 72 +-
4720 .../lustre/lustre/include/lustre/lustre_user.h | 27 +-
4721 .../lustre/lustre/include/lustre/lustreapi.h | 310 --
4722 .../staging/lustre/lustre/include/lustre_disk.h | 1 +
4723 drivers/staging/lustre/lustre/include/lustre_dlm.h | 3 +-
4724 .../lustre/lustre/include/lustre_dlm_flags.h | 90 +-
4725 drivers/staging/lustre/lustre/include/lustre_ha.h | 3 -
4726 drivers/staging/lustre/lustre/include/lustre_lib.h | 11 +-
4727 drivers/staging/lustre/lustre/include/lustre_log.h | 13 +-
4728 drivers/staging/lustre/lustre/include/lustre_mdc.h | 9 +-
4729 drivers/staging/lustre/lustre/include/lustre_net.h | 11 -
4730 .../lustre/lustre/include/lustre_req_layout.h | 7 +
4731 drivers/staging/lustre/lustre/include/lustre_sec.h | 17 +-
4732 drivers/staging/lustre/lustre/include/md_object.h | 4 +-
4733 drivers/staging/lustre/lustre/include/obd.h | 15 +-
4734 .../staging/lustre/lustre/include/obd_support.h | 12 +-
4735 drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 6 +
4736 .../staging/lustre/lustre/lclient/lcommon_misc.c | 4 +-
4737 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 45 +-
4738 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 7 +
4739 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 57 +-
4740 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 9 +
4741 drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 43 +-
4742 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 19 +-
4743 drivers/staging/lustre/lustre/libcfs/debug.c | 42 +-
4744 drivers/staging/lustre/lustre/libcfs/hash.c | 4 +-
4745 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 6 +-
4746 .../lustre/lustre/libcfs/linux/linux-curproc.c | 13 -
4747 .../lustre/lustre/libcfs/linux/linux-proc.c | 36 +-
4748 drivers/staging/lustre/lustre/libcfs/lwt.c | 266 --
4749 drivers/staging/lustre/lustre/libcfs/module.c | 53 +-
4750 drivers/staging/lustre/lustre/libcfs/nidstrings.c | 34 +-
4751 drivers/staging/lustre/lustre/libcfs/tracefile.c | 22 +-
4752 drivers/staging/lustre/lustre/llite/Makefile | 5 +-
4753 drivers/staging/lustre/lustre/llite/dcache.c | 34 +-
4754 drivers/staging/lustre/lustre/llite/dir.c | 24 +-
4755 drivers/staging/lustre/lustre/llite/file.c | 539 ++-
4756 .../staging/lustre/lustre/llite/llite_internal.h | 74 +-
4757 drivers/staging/lustre/lustre/llite/llite_lib.c | 60 +-
4758 drivers/staging/lustre/lustre/llite/lloop.c | 3 +-
4759 drivers/staging/lustre/lustre/llite/lproc_llite.c | 41 +-
4760 drivers/staging/lustre/lustre/llite/namei.c | 14 +-
4761 drivers/staging/lustre/lustre/llite/super25.c | 4 +
4762 drivers/staging/lustre/lustre/llite/vvp_io.c | 54 +-
4763 drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +-
4764 drivers/staging/lustre/lustre/llite/xattr.c | 104 +-
4765 drivers/staging/lustre/lustre/llite/xattr_cache.c | 617 +++
4766 drivers/staging/lustre/lustre/lmv/Makefile | 4 +-
4767 drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 5 -
4768 drivers/staging/lustre/lustre/lov/Makefile | 3 +-
4769 .../staging/lustre/lustre/lov/lov_cl_internal.h | 16 +
4770 drivers/staging/lustre/lustre/lov/lov_internal.h | 2 +-
4771 drivers/staging/lustre/lustre/lov/lov_io.c | 15 +-
4772 drivers/staging/lustre/lustre/lov/lov_object.c | 35 +-
4773 drivers/staging/lustre/lustre/lov/lov_pack.c | 20 +-
4774 drivers/staging/lustre/lustre/lov/lproc_lov.c | 40 +-
4775 drivers/staging/lustre/lustre/lvfs/Makefile | 3 +-
4776 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c | 760 ----
4777 drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 2 -
4778 drivers/staging/lustre/lustre/mdc/Makefile | 3 +-
4779 drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 3 -
4780 drivers/staging/lustre/lustre/mdc/mdc_internal.h | 3 +-
4781 drivers/staging/lustre/lustre/mdc/mdc_lib.c | 31 +-
4782 drivers/staging/lustre/lustre/mdc/mdc_locks.c | 112 +-
4783 drivers/staging/lustre/lustre/mdc/mdc_request.c | 54 +-
4784 drivers/staging/lustre/lustre/mgc/Makefile | 3 +-
4785 drivers/staging/lustre/lustre/mgc/libmgc.c | 3 -
4786 drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 3 -
4787 drivers/staging/lustre/lustre/mgc/mgc_internal.h | 2 +-
4788 drivers/staging/lustre/lustre/mgc/mgc_request.c | 400 +-
4789 drivers/staging/lustre/lustre/obdclass/class_obd.c | 20 +-
4790 drivers/staging/lustre/lustre/obdclass/genops.c | 3 +-
4791 .../lustre/lustre/obdclass/linux/linux-module.c | 5 +-
4792 .../lustre/lustre/obdclass/linux/linux-sysctl.c | 21 +-
4793 drivers/staging/lustre/lustre/obdclass/llog.c | 214 +-
4794 drivers/staging/lustre/lustre/obdclass/llog_test.c | 6 +-
4795 .../staging/lustre/lustre/obdclass/local_storage.c | 11 +-
4796 .../staging/lustre/lustre/obdclass/local_storage.h | 3 +
4797 .../lustre/lustre/obdclass/lprocfs_status.c | 356 +-
4798 drivers/staging/lustre/lustre/obdclass/lu_object.c | 30 +-
4799 drivers/staging/lustre/lustre/obdclass/obd_mount.c | 3 +
4800 .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
4801 drivers/staging/lustre/lustre/osc/Makefile | 3 +-
4802 drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 -
4803 drivers/staging/lustre/lustre/osc/osc_request.c | 4 -
4804 drivers/staging/lustre/lustre/ptlrpc/Makefile | 5 +-
4805 drivers/staging/lustre/lustre/ptlrpc/client.c | 25 +-
4806 drivers/staging/lustre/lustre/ptlrpc/events.c | 75 +-
4807 .../staging/lustre/lustre/ptlrpc/gss/gss_asn1.h | 6 +-
4808 drivers/staging/lustre/lustre/ptlrpc/gss/gss_err.h | 10 +-
4809 .../staging/lustre/lustre/ptlrpc/gss/gss_keyring.c | 2 +-
4810 .../lustre/lustre/ptlrpc/gss/gss_krb5_mech.c | 2 +-
4811 drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c | 14 +-
4812 drivers/staging/lustre/lustre/ptlrpc/import.c | 40 +-
4813 drivers/staging/lustre/lustre/ptlrpc/layout.c | 73 +-
4814 drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 6 +-
4815 drivers/staging/lustre/lustre/ptlrpc/llog_server.c | 450 --
4816 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 14 +-
4817 drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 81 +-
4818 .../staging/lustre/lustre/ptlrpc/pack_generic.c | 375 +-
4819 drivers/staging/lustre/lustre/ptlrpc/pinger.c | 70 +-
4820 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 16 +-
4821 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +-
4822 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 50 +-
4823 drivers/staging/lustre/lustre/ptlrpc/service.c | 77 +-
4824 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c | 47 -
4825 drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 28 +-
4826 drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 2 +-
4827 .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +-
4828 drivers/staging/media/dt3155v4l/dt3155v4l.c | 2 +-
4829 drivers/staging/media/go7007/go7007-fw.c | 3 +-
4830 drivers/staging/media/go7007/saa7134-go7007.c | 2 +-
4831 drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
4832 drivers/staging/media/lirc/lirc_imon.c | 11 +-
4833 drivers/staging/media/lirc/lirc_serial.c | 6 +-
4834 drivers/staging/media/lirc/lirc_zilog.c | 4 +-
4835 drivers/staging/media/solo6x10/solo6x10-core.c | 2 +-
4836 drivers/staging/olpc_dcon/olpc_dcon.c | 6 +-
4837 drivers/staging/ozwpan/ozeltbuf.c | 2 +-
4838 drivers/staging/ozwpan/ozproto.c | 2 +-
4839 drivers/staging/phison/phison.c | 2 +-
4840 drivers/staging/rtl8187se/ieee80211/dot11d.c | 132 +-
4841 drivers/staging/rtl8187se/ieee80211/dot11d.h | 66 +-
4842 drivers/staging/rtl8187se/ieee80211/ieee80211.h | 125 +-
4843 .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 3 +-
4844 .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 12 +-
4845 .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 52 +-
4846 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 39 +-
4847 .../rtl8187se/ieee80211/ieee80211_softmac.c | 134 +-
4848 .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 64 +-
4849 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 13 +-
4850 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 8 +-
4851 drivers/staging/rtl8187se/r8180.h | 32 +-
4852 drivers/staging/rtl8187se/r8180_core.c | 29 +-
4853 drivers/staging/rtl8187se/r8180_dm.h | 2 +-
4854 drivers/staging/rtl8187se/r8180_rtl8225.h | 3 +-
4855 drivers/staging/rtl8187se/r8180_wx.c | 202 +-
4856 drivers/staging/rtl8187se/r8185b_init.c | 17 +-
4857 drivers/staging/rtl8188eu/core/rtw_io.c | 2 +-
4858 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +-
4859 drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
4860 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +-
4861 drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 2 +-
4862 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 34 +-
4863 drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +-
4864 drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
4865 drivers/staging/rtl8192e/dot11d.c | 2 +-
4866 drivers/staging/rtl8192e/dot11d.h | 5 +-
4867 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 13 +-
4868 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 1 -
4869 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 24 +-
4870 drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +
4871 drivers/staging/rtl8192e/rtl819x_BAProc.c | 10 +-
4872 drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 4 +-
4873 drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 +-
4874 drivers/staging/rtl8192e/rtllib_crypt_wep.c | 4 +-
4875 drivers/staging/rtl8192e/rtllib_module.c | 4 +-
4876 drivers/staging/rtl8192e/rtllib_rx.c | 74 +-
4877 drivers/staging/rtl8192e/rtllib_softmac.c | 28 +-
4878 drivers/staging/rtl8192e/rtllib_tx.c | 16 +-
4879 drivers/staging/rtl8712/rtl871x_mlme.c | 3 -
4880 drivers/staging/rts5208/Kconfig | 15 +
4881 drivers/staging/rts5208/Makefile | 6 +
4882 drivers/staging/rts5208/TODO | 7 +
4883 drivers/staging/rts5208/debug.h | 43 +
4884 drivers/staging/rts5208/general.c | 35 +
4885 drivers/staging/rts5208/general.h | 31 +
4886 drivers/staging/rts5208/ms.c | 4208 ++++++++++++++++++
4887 drivers/staging/rts5208/ms.h | 227 +
4888 drivers/staging/rts5208/rtsx.c | 1071 +++++
4889 drivers/staging/rts5208/rtsx.h | 186 +
4890 drivers/staging/rts5208/rtsx_card.c | 1126 +++++
4891 drivers/staging/rts5208/rtsx_card.h | 1098 +++++
4892 drivers/staging/rts5208/rtsx_chip.c | 1979 +++++++++
4893 drivers/staging/rts5208/rtsx_chip.h | 1002 +++++
4894 drivers/staging/rts5208/rtsx_scsi.c | 3370 +++++++++++++++
4895 drivers/staging/rts5208/rtsx_scsi.h | 143 +
4896 drivers/staging/rts5208/rtsx_sys.h | 50 +
4897 drivers/staging/rts5208/rtsx_transport.c | 769 ++++
4898 drivers/staging/rts5208/rtsx_transport.h | 66 +
4899 drivers/staging/rts5208/sd.c | 4525 ++++++++++++++++++++
4900 drivers/staging/rts5208/sd.h | 301 ++
4901 drivers/staging/rts5208/spi.c | 877 ++++
4902 drivers/staging/rts5208/spi.h | 65 +
4903 drivers/staging/rts5208/trace.h | 93 +
4904 drivers/staging/rts5208/xd.c | 2088 +++++++++
4905 drivers/staging/rts5208/xd.h | 188 +
4906 drivers/staging/sb105x/sb_mp_register.h | 8 +-
4907 drivers/staging/sb105x/sb_pci_mp.c | 4 +-
4908 drivers/staging/sep/sep_main.c | 2 +-
4909 drivers/staging/silicom/bpctl_mod.c | 2 -
4910 drivers/staging/silicom/bypasslib/bypass.c | 14 +-
4911 drivers/staging/slicoss/README | 1 -
4912 drivers/staging/slicoss/slicoss.c | 23 +-
4913 drivers/staging/sm7xxfb/sm7xxfb.c | 2 +-
4914 drivers/staging/speakup/main.c | 2 -
4915 drivers/staging/speakup/serialio.c | 4 +
4916 drivers/staging/speakup/serialio.h | 26 -
4917 drivers/staging/tidspbridge/pmgr/cmm.c | 7 +-
4918 drivers/staging/tidspbridge/pmgr/dbll.c | 21 +-
4919 drivers/staging/tidspbridge/pmgr/dev.c | 6 +-
4920 drivers/staging/tidspbridge/pmgr/dmm.c | 20 +-
4921 drivers/staging/tidspbridge/pmgr/dspapi.c | 12 +-
4922 drivers/staging/usbip/stub_rx.c | 20 +-
4923 drivers/staging/usbip/usbip_common.c | 5 +-
4924 drivers/staging/usbip/vhci_hcd.c | 15 +-
4925 drivers/staging/vme/devices/vme_user.c | 13 +-
4926 drivers/staging/vt6655/baseband.c | 4 +-
4927 drivers/staging/vt6655/bssdb.c | 354 +-
4928 drivers/staging/vt6655/card.c | 10 +-
4929 drivers/staging/vt6655/channel.c | 16 +-
4930 drivers/staging/vt6655/datarate.c | 8 +-
4931 drivers/staging/vt6655/device_main.c | 62 +-
4932 drivers/staging/vt6655/dpc.c | 40 +-
4933 drivers/staging/vt6655/hostap.c | 12 +-
4934 drivers/staging/vt6655/iwctl.c | 2 +-
4935 drivers/staging/vt6655/key.c | 44 +-
4936 drivers/staging/vt6655/mac.c | 4 +-
4937 drivers/staging/vt6655/power.c | 9 +-
4938 drivers/staging/vt6655/rf.c | 2 +-
4939 drivers/staging/vt6655/rxtx.c | 12 +-
4940 drivers/staging/vt6655/vntwifi.c | 6 +-
4941 drivers/staging/vt6655/wcmd.c | 22 +-
4942 drivers/staging/vt6655/wctl.c | 6 +-
4943 drivers/staging/vt6655/wmgr.c | 125 +-
4944 drivers/staging/vt6655/wpa.c | 2 +-
4945 drivers/staging/vt6655/wpa2.c | 18 +-
4946 drivers/staging/vt6655/wpactl.c | 12 +-
4947 drivers/staging/vt6656/aes_ccmp.c | 16 +-
4948 drivers/staging/vt6656/baseband.c | 332 +-
4949 drivers/staging/vt6656/bssdb.c | 4 +-
4950 drivers/staging/vt6656/card.c | 4 +-
4951 drivers/staging/vt6656/channel.c | 3 +-
4952 drivers/staging/vt6656/datarate.c | 2 +-
4953 drivers/staging/vt6656/desc.h | 8 -
4954 drivers/staging/vt6656/device.h | 16 +-
4955 drivers/staging/vt6656/dpc.c | 2 +-
4956 drivers/staging/vt6656/main_usb.c | 543 ++-
4957 drivers/staging/vt6656/rf.c | 7 +-
4958 drivers/staging/vt6656/rndis.h | 30 +-
4959 drivers/staging/vt6656/rxtx.c | 222 +-
4960 drivers/staging/vt6656/rxtx.h | 12 +-
4961 drivers/staging/vt6656/tkip.c | 4 +-
4962 drivers/staging/vt6656/wcmd.c | 1712 ++++----
4963 drivers/staging/vt6656/wmgr.c | 10 +-
4964 drivers/staging/vt6656/wpa.c | 12 +-
4965 drivers/staging/vt6656/wpa2.c | 16 +-
4966 drivers/staging/winbond/mds.c | 101 +-
4967 drivers/staging/wlags49_h2/sta_h25.c | 6 +-
4968 drivers/staging/wlan-ng/cfg80211.c | 18 +-
4969 drivers/staging/wlan-ng/hfa384x.h | 4 +-
4970 drivers/staging/wlan-ng/prism2mgmt.c | 4 +-
4971 drivers/staging/wlan-ng/prism2mgmt.h | 6 +-
4972 drivers/staging/wlan-ng/prism2mib.c | 6 +-
4973 drivers/staging/wlan-ng/prism2sta.c | 6 +-
4974 drivers/staging/xgifb/XGI_main.h | 2 +-
4975 drivers/staging/xillybus/xillybus_pcie.c | 2 +-
4976 drivers/vme/boards/vme_vmivme7805.c | 2 +-
4977 drivers/vme/bridges/vme_ca91cx42.c | 2 +-
4978 drivers/vme/bridges/vme_tsi148.c | 2 +-
4979 drivers/vme/vme.c | 19 +-
4980 include/linux/hid-sensor-ids.h | 8 +
4981 include/linux/iio/iio.h | 81 +-
4982 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
4983 include/linux/vme.h | 3 +-
4984 508 files changed, 37681 insertions(+), 16041 deletions(-)
4985 create mode 100644 Documentation/devicetree/bindings/iio/light/tsl2563.txt
4986 create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt
4987 create mode 100644 drivers/iio/pressure/mpl3115.c
4988 delete mode 100644 drivers/staging/btmtk_usb/Kconfig
4989 delete mode 100644 drivers/staging/btmtk_usb/Makefile
4990 delete mode 100644 drivers/staging/btmtk_usb/README
4991 delete mode 100644 drivers/staging/btmtk_usb/TODO
4992 delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.c
4993 delete mode 100644 drivers/staging/btmtk_usb/btmtk_usb.h
4994 create mode 100644 drivers/staging/imx-drm/imx-hdmi.c
4995 create mode 100644 drivers/staging/imx-drm/imx-hdmi.h
4996 delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-fs.h
4997 delete mode 100644 drivers/staging/lustre/lustre/include/lu_target.h
4998 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/liblustreapi.h
4999 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustreapi.h
5000 delete mode 100644 drivers/staging/lustre/lustre/libcfs/lwt.c
5001 create mode 100644 drivers/staging/lustre/lustre/llite/xattr_cache.c
5002 delete mode 100644 drivers/staging/lustre/lustre/lvfs/fsfilt_ext3.c
5003 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/llog_server.c
5004 delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/wirehdr.c
5005 create mode 100644 drivers/staging/rts5208/Kconfig
5006 create mode 100644 drivers/staging/rts5208/Makefile
5007 create mode 100644 drivers/staging/rts5208/TODO
5008 create mode 100644 drivers/staging/rts5208/debug.h
5009 create mode 100644 drivers/staging/rts5208/general.c
5010 create mode 100644 drivers/staging/rts5208/general.h
5011 create mode 100644 drivers/staging/rts5208/ms.c
5012 create mode 100644 drivers/staging/rts5208/ms.h
5013 create mode 100644 drivers/staging/rts5208/rtsx.c
5014 create mode 100644 drivers/staging/rts5208/rtsx.h
5015 create mode 100644 drivers/staging/rts5208/rtsx_card.c
5016 create mode 100644 drivers/staging/rts5208/rtsx_card.h
5017 create mode 100644 drivers/staging/rts5208/rtsx_chip.c
5018 create mode 100644 drivers/staging/rts5208/rtsx_chip.h
5019 create mode 100644 drivers/staging/rts5208/rtsx_scsi.c
5020 create mode 100644 drivers/staging/rts5208/rtsx_scsi.h
5021 create mode 100644 drivers/staging/rts5208/rtsx_sys.h
5022 create mode 100644 drivers/staging/rts5208/rtsx_transport.c
5023 create mode 100644 drivers/staging/rts5208/rtsx_transport.h
5024 create mode 100644 drivers/staging/rts5208/sd.c
5025 create mode 100644 drivers/staging/rts5208/sd.h
5026 create mode 100644 drivers/staging/rts5208/spi.c
5027 create mode 100644 drivers/staging/rts5208/spi.h
5028 create mode 100644 drivers/staging/rts5208/trace.h
5029 create mode 100644 drivers/staging/rts5208/xd.c
5030 create mode 100644 drivers/staging/rts5208/xd.h
5031 Merging char-misc/char-misc-next (4455d9fd4809 pcmcia: Remove superfluous name casts)
5032 $ git merge char-misc/char-misc-next
5033 Auto-merging drivers/misc/mei/pci-me.c
5034 Merge made by the 'recursive' strategy.
5035 Documentation/devicetree/bindings/misc/bmp085.txt | 4 ++
5036 drivers/char/agp/amd64-agp.c | 2 +-
5037 drivers/misc/bmp085-i2c.c | 2 +-
5038 drivers/misc/bmp085-spi.c | 2 +-
5039 drivers/misc/bmp085.c | 39 +++++++++--
5040 drivers/misc/bmp085.h | 2 +-
5041 drivers/misc/eeprom/eeprom_93xx46.c | 1 -
5042 drivers/misc/lkdtm.c | 5 +-
5043 drivers/misc/mei/client.c | 2 -
5044 drivers/misc/mei/init.c | 17 +++--
5045 drivers/misc/mei/interrupt.c | 79 ++++++++++++-----------
5046 drivers/misc/mei/mei_dev.h | 13 +++-
5047 drivers/misc/mei/nfc.c | 6 +-
5048 drivers/misc/mei/pci-me.c | 2 +-
5049 drivers/misc/ti-st/st_core.c | 2 +-
5050 drivers/misc/ti-st/st_kim.c | 1 -
5051 drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
5052 drivers/pcmcia/electra_cf.c | 2 +-
5053 drivers/uio/uio_mf624.c | 2 +-
5054 drivers/w1/masters/mxc_w1.c | 31 ++++++---
5055 tools/hv/hv_kvp_daemon.c | 1 -
5056 tools/hv/hv_vss_daemon.c | 1 -
5057 22 files changed, 142 insertions(+), 76 deletions(-)
5058 Merging scsi/for-next (ef5cb624a9b2 Merge branch 'fixes' into for-next)
5059 $ git merge scsi/for-next
5060 Auto-merging drivers/scsi/sd.c
5061 Removing drivers/scsi/aic7xxx_old/sequencer.h
5062 Removing drivers/scsi/aic7xxx_old/scsi_message.h
5063 Removing drivers/scsi/aic7xxx_old/aic7xxx_seq.c
5064 Removing drivers/scsi/aic7xxx_old/aic7xxx_reg.h
5065 Removing drivers/scsi/aic7xxx_old/aic7xxx_proc.c
5066 Removing drivers/scsi/aic7xxx_old/aic7xxx.seq
5067 Removing drivers/scsi/aic7xxx_old/aic7xxx.reg
5068 Removing drivers/scsi/aic7xxx_old/aic7xxx.h
5069 Removing drivers/scsi/aic7xxx_old.c
5070 Auto-merging drivers/scsi/Kconfig
5071 Auto-merging MAINTAINERS
5072 Removing Documentation/scsi/aic7xxx_old.txt
5073 Merge made by the 'recursive' strategy.
5074 Documentation/scsi/00-INDEX | 2 -
5075 Documentation/scsi/aic7xxx_old.txt | 511 --
5076 Documentation/scsi/scsi_eh.txt | 69 +-
5077 Documentation/scsi/scsi_mid_low_api.txt | 9 +-
5079 drivers/scsi/Kconfig | 41 -
5080 drivers/scsi/Makefile | 1 -
5081 drivers/scsi/aic7xxx_old.c | 11149 ----------------------------
5082 drivers/scsi/aic7xxx_old/aic7xxx.h | 28 -
5083 drivers/scsi/aic7xxx_old/aic7xxx.reg | 1401 ----
5084 drivers/scsi/aic7xxx_old/aic7xxx.seq | 1539 ----
5085 drivers/scsi/aic7xxx_old/aic7xxx_proc.c | 270 -
5086 drivers/scsi/aic7xxx_old/aic7xxx_reg.h | 629 --
5087 drivers/scsi/aic7xxx_old/aic7xxx_seq.c | 817 --
5088 drivers/scsi/aic7xxx_old/scsi_message.h | 49 -
5089 drivers/scsi/aic7xxx_old/sequencer.h | 135 -
5090 drivers/scsi/be2iscsi/be_iscsi.c | 8 +-
5091 drivers/scsi/hosts.c | 30 +-
5092 drivers/scsi/hpsa.c | 308 +-
5093 drivers/scsi/hpsa.h | 20 +
5094 drivers/scsi/ipr.c | 2 +-
5095 drivers/scsi/ipr.h | 2 +-
5096 drivers/scsi/lpfc/lpfc_debugfs.c | 2 +-
5097 drivers/scsi/megaraid/megaraid_sas.h | 1 -
5098 drivers/scsi/megaraid/megaraid_sas_base.c | 5 +-
5099 drivers/scsi/qla2xxx/qla_attr.c | 116 +-
5100 drivers/scsi/qla2xxx/qla_bsg.c | 44 +
5101 drivers/scsi/qla2xxx/qla_bsg.h | 13 +
5102 drivers/scsi/qla2xxx/qla_dbg.c | 7 +-
5103 drivers/scsi/qla2xxx/qla_def.h | 22 +-
5104 drivers/scsi/qla2xxx/qla_gbl.h | 15 +-
5105 drivers/scsi/qla2xxx/qla_init.c | 2 +
5106 drivers/scsi/qla2xxx/qla_inline.h | 19 -
5107 drivers/scsi/qla2xxx/qla_isr.c | 82 +-
5108 drivers/scsi/qla2xxx/qla_mbx.c | 73 +-
5109 drivers/scsi/qla2xxx/qla_mr.c | 39 +-
5110 drivers/scsi/qla2xxx/qla_mr.h | 12 +-
5111 drivers/scsi/qla2xxx/qla_nx.c | 22 +-
5112 drivers/scsi/qla2xxx/qla_nx2.c | 33 +-
5113 drivers/scsi/qla2xxx/qla_os.c | 368 +-
5114 drivers/scsi/qla2xxx/qla_version.h | 2 +-
5115 drivers/scsi/qla4xxx/ql4_def.h | 32 +
5116 drivers/scsi/qla4xxx/ql4_fw.h | 43 +-
5117 drivers/scsi/qla4xxx/ql4_glbl.h | 1 +
5118 drivers/scsi/qla4xxx/ql4_isr.c | 32 +
5119 drivers/scsi/qla4xxx/ql4_mbx.c | 111 +-
5120 drivers/scsi/qla4xxx/ql4_os.c | 1137 ++-
5121 drivers/scsi/qla4xxx/ql4_version.h | 2 +-
5122 drivers/scsi/scsi.c | 9 +-
5123 drivers/scsi/scsi_debug.c | 266 +-
5124 drivers/scsi/scsi_error.c | 229 +-
5125 drivers/scsi/scsi_pm.c | 62 +-
5126 drivers/scsi/scsi_priv.h | 2 +
5127 drivers/scsi/scsi_sysfs.c | 36 +-
5128 drivers/scsi/scsi_transport_iscsi.c | 340 +-
5129 drivers/scsi/sd.c | 28 +-
5130 drivers/scsi/sr.c | 37 +-
5131 include/scsi/iscsi_if.h | 117 +-
5132 include/scsi/scsi_cmnd.h | 1 +
5133 include/scsi/scsi_driver.h | 2 +-
5134 include/scsi/scsi_host.h | 10 +
5135 include/scsi/scsi_transport_iscsi.h | 3 +
5136 62 files changed, 2949 insertions(+), 17455 deletions(-)
5137 delete mode 100644 Documentation/scsi/aic7xxx_old.txt
5138 delete mode 100644 drivers/scsi/aic7xxx_old.c
5139 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.h
5140 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.reg
5141 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx.seq
5142 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_proc.c
5143 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_reg.h
5144 delete mode 100644 drivers/scsi/aic7xxx_old/aic7xxx_seq.c
5145 delete mode 100644 drivers/scsi/aic7xxx_old/scsi_message.h
5146 delete mode 100644 drivers/scsi/aic7xxx_old/sequencer.h
5147 Merging target-updates/for-next (86784c6bdeee iscsi-target: chap auth shouldn't match username with trailing garbage)
5148 $ git merge target-updates/for-next
5150 Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
5151 $ git merge target-merge/for-next-merge
5153 Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
5154 $ git merge writeback/writeback-for-next
5156 Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
5157 $ git merge hwspinlock/linux-next
5159 Merging pinctrl/for-next (6bca8471566c pinctrl: select dependency on OF for MSM driver)
5160 $ git merge pinctrl/for-next
5161 Auto-merging drivers/pinctrl/pinctrl-baytrail.c
5162 Merge made by the 'recursive' strategy.
5163 .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 +
5164 .../bindings/pinctrl/qcom,msm8x74-pinctrl.txt | 92 ++
5165 drivers/pinctrl/Kconfig | 21 +
5166 drivers/pinctrl/Makefile | 3 +
5167 drivers/pinctrl/pinctrl-baytrail.c | 30 +-
5168 drivers/pinctrl/pinctrl-imx25.c | 351 +++++++
5169 drivers/pinctrl/pinctrl-msm.c | 1028 ++++++++++++++++++++
5170 drivers/pinctrl/pinctrl-msm.h | 122 +++
5171 drivers/pinctrl/pinctrl-msm8x74.c | 636 ++++++++++++
5172 include/linux/pinctrl/pinconf-generic.h | 6 +-
5173 10 files changed, 2309 insertions(+), 3 deletions(-)
5174 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
5175 create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8x74-pinctrl.txt
5176 create mode 100644 drivers/pinctrl/pinctrl-imx25.c
5177 create mode 100644 drivers/pinctrl/pinctrl-msm.c
5178 create mode 100644 drivers/pinctrl/pinctrl-msm.h
5179 create mode 100644 drivers/pinctrl/pinctrl-msm8x74.c
5180 $ git reset --hard HEAD^
5181 HEAD is now at 45f506d3f835 Merge remote-tracking branch 'scsi/for-next'
5182 Merging next-20131206 version of pinctrl
5183 $ git merge -m next-20131206/pinctrl a8b2d7c89dc86232f4d00513a3d9f585dd447c8e
5184 Auto-merging drivers/pinctrl/pinctrl-baytrail.c
5185 Merge made by the 'recursive' strategy.
5186 .../bindings/pinctrl/fsl,imx25-pinctrl.txt | 23 ++
5187 drivers/pinctrl/Kconfig | 9 +
5188 drivers/pinctrl/Makefile | 1 +
5189 drivers/pinctrl/pinctrl-baytrail.c | 30 +-
5190 drivers/pinctrl/pinctrl-imx25.c | 351 +++++++++++++++++++++
5191 include/linux/pinctrl/pinconf-generic.h | 6 +-
5192 6 files changed, 417 insertions(+), 3 deletions(-)
5193 create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx25-pinctrl.txt
5194 create mode 100644 drivers/pinctrl/pinctrl-imx25.c
5195 Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
5196 $ git merge vhost/linux-next
5198 Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
5199 $ git merge remoteproc/for-next
5201 Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
5202 $ git merge rpmsg/for-next
5204 Merging gpio/for-next (fdd6a5fe8988 gpiolib: update inline documentation of gpiod_get_index())
5205 $ git merge gpio/for-next
5206 Auto-merging drivers/pinctrl/pinctrl-nomadik.c
5207 Auto-merging drivers/pinctrl/pinctrl-baytrail.c
5208 Auto-merging drivers/gpio/Makefile
5209 Auto-merging drivers/gpio/Kconfig
5210 Removing arch/arm/mach-mv78xx0/include/mach/gpio.h
5211 Removing arch/arm/mach-lpc32xx/include/mach/gpio.h
5212 Removing arch/arm/mach-ks8695/include/mach/gpio.h
5213 Merge made by the 'recursive' strategy.
5214 .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 ++
5215 .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 +-
5216 Documentation/gpio/board.txt | 28 ++-
5217 arch/arm/mach-ks8695/include/mach/gpio.h | 19 --
5218 arch/arm/mach-lpc32xx/include/mach/gpio.h | 6 -
5219 arch/arm/mach-lpc32xx/phy3250.c | 2 +-
5220 arch/arm/mach-mv78xx0/include/mach/gpio.h | 9 -
5221 drivers/gpio/Kconfig | 9 +-
5222 drivers/gpio/Makefile | 1 +
5223 drivers/gpio/gpio-74x164.c | 2 +-
5224 drivers/gpio/gpio-adnp.c | 25 ++-
5225 drivers/gpio/gpio-adp5520.c | 2 +-
5226 drivers/gpio/gpio-adp5588.c | 2 +-
5227 drivers/gpio/gpio-amd8111.c | 2 +-
5228 drivers/gpio/gpio-arizona.c | 2 +-
5229 drivers/gpio/gpio-bcm-kona.c | 22 ++
5230 drivers/gpio/gpio-bt8xx.c | 4 +-
5231 drivers/gpio/gpio-da9052.c | 2 +-
5232 drivers/gpio/gpio-da9055.c | 2 +-
5233 drivers/gpio/gpio-em.c | 28 ++-
5234 drivers/gpio/gpio-ich.c | 2 +-
5235 drivers/gpio/gpio-intel-mid.c | 30 ++-
5236 drivers/gpio/gpio-kempld.c | 2 +-
5237 drivers/gpio/gpio-ks8695.c | 2 +-
5238 drivers/gpio/gpio-lpc32xx.c | 14 +-
5239 drivers/gpio/gpio-lynxpoint.c | 39 +++-
5240 drivers/gpio/gpio-max730x.c | 2 +-
5241 drivers/gpio/gpio-max732x.c | 2 +-
5242 drivers/gpio/gpio-mc33880.c | 2 +-
5243 drivers/gpio/gpio-mc9s08dz60.c | 2 +-
5244 drivers/gpio/gpio-mcp23s08.c | 2 +-
5245 drivers/gpio/gpio-ml-ioh.c | 4 +-
5246 drivers/gpio/gpio-moxart.c | 158 ++++++++++++++
5247 drivers/gpio/gpio-msic.c | 9 +-
5248 drivers/gpio/gpio-mvebu.c | 2 +-
5249 drivers/gpio/gpio-octeon.c | 2 +-
5250 drivers/gpio/gpio-omap.c | 188 ++++++++---------
5251 drivers/gpio/gpio-palmas.c | 2 +-
5252 drivers/gpio/gpio-pca953x.c | 2 +-
5253 drivers/gpio/gpio-pcf857x.c | 2 +-
5254 drivers/gpio/gpio-pch.c | 4 +-
5255 drivers/gpio/gpio-rc5t583.c | 2 +-
5256 drivers/gpio/gpio-rcar.c | 61 ++++--
5257 drivers/gpio/gpio-sodaville.c | 2 +-
5258 drivers/gpio/gpio-sta2x11.c | 2 +-
5259 drivers/gpio/gpio-stmpe.c | 2 +-
5260 drivers/gpio/gpio-sx150x.c | 2 +-
5261 drivers/gpio/gpio-tb10x.c | 2 +-
5262 drivers/gpio/gpio-tc3589x.c | 2 +-
5263 drivers/gpio/gpio-timberdale.c | 6 +-
5264 drivers/gpio/gpio-tnetv107x.c | 2 +-
5265 drivers/gpio/gpio-tps6586x.c | 2 +-
5266 drivers/gpio/gpio-tps65910.c | 2 +-
5267 drivers/gpio/gpio-tps65912.c | 2 +-
5268 drivers/gpio/gpio-twl4030.c | 2 +-
5269 drivers/gpio/gpio-twl6040.c | 2 +-
5270 drivers/gpio/gpio-ucb1400.c | 2 +-
5271 drivers/gpio/gpio-viperboard.c | 4 +-
5272 drivers/gpio/gpio-vx855.c | 2 +-
5273 drivers/gpio/gpio-wm831x.c | 2 +-
5274 drivers/gpio/gpio-wm8350.c | 2 +-
5275 drivers/gpio/gpio-wm8994.c | 2 +-
5276 drivers/gpio/gpiolib.c | 232 +++++++++++----------
5277 drivers/pinctrl/pinctrl-as3722.c | 2 +-
5278 drivers/pinctrl/pinctrl-at91.c | 2 +-
5279 drivers/pinctrl/pinctrl-baytrail.c | 2 +-
5280 drivers/pinctrl/pinctrl-bcm2835.c | 2 +-
5281 drivers/pinctrl/pinctrl-nomadik.c | 2 +-
5282 drivers/pinctrl/pinctrl-sunxi.c | 2 +-
5283 drivers/pinctrl/vt8500/pinctrl-wmt.c | 2 +-
5284 include/linux/gpio.h | 1 -
5285 include/linux/gpio/driver.h | 56 +++--
5286 .../linux/platform_data}/gpio-lpc32xx.h | 0
5287 73 files changed, 695 insertions(+), 376 deletions(-)
5288 create mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt
5289 delete mode 100644 arch/arm/mach-ks8695/include/mach/gpio.h
5290 delete mode 100644 arch/arm/mach-lpc32xx/include/mach/gpio.h
5291 delete mode 100644 arch/arm/mach-mv78xx0/include/mach/gpio.h
5292 create mode 100644 drivers/gpio/gpio-moxart.c
5293 rename {arch/arm/mach-lpc32xx/include/mach => include/linux/platform_data}/gpio-lpc32xx.h (100%)
5294 Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12)
5295 $ git merge dma-mapping/dma-mapping-next
5297 Merging pwm/for-next (6ca142ad0d1b pwm: sysfs: Convert to use ATTRIBUTE_GROUPS macro)
5298 $ git merge pwm/for-next
5299 Merge made by the 'recursive' strategy.
5300 Documentation/devicetree/bindings/pwm/pxa-pwm.txt | 30 +++++++++++++
5301 drivers/pwm/pwm-pxa.c | 53 +++++++++++++++++++++++
5302 drivers/pwm/sysfs.c | 12 +----
5303 3 files changed, 85 insertions(+), 10 deletions(-)
5304 create mode 100644 Documentation/devicetree/bindings/pwm/pxa-pwm.txt
5305 Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
5306 $ git merge dma-buf/for-next
5308 Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc)
5309 $ git merge userns/for-next
5310 Auto-merging kernel/fork.c
5311 Auto-merging fs/namespace.c
5312 Merge made by the 'recursive' strategy.
5313 fs/dcache.c | 7 ++++++-
5314 fs/namespace.c | 2 +-
5315 kernel/fork.c | 2 +-
5316 3 files changed, 8 insertions(+), 3 deletions(-)
5317 Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL)
5318 $ git merge ktest/for-next
5319 Auto-merging tools/testing/ktest/ktest.pl
5320 Merge made by the 'recursive' strategy.
5321 tools/testing/ktest/ktest.pl | 5 ++++-
5322 tools/testing/ktest/sample.conf | 7 +++++++
5323 2 files changed, 11 insertions(+), 1 deletion(-)
5324 Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
5325 $ git merge signal/for-next
5327 Merging clk/clk-next (cdf64eeeb0d7 clk: exynos5420: fix cpll clock register offsets)
5328 $ git merge clk/clk-next
5329 Merge made by the 'recursive' strategy.
5330 .../bindings/clock/fixed-factor-clock.txt | 4 +-
5331 .../bindings/clock/nvidia,tegra124-car.txt | 59 +
5332 drivers/clk/clk-composite.c | 28 +
5333 drivers/clk/clk.c | 3 +-
5334 drivers/clk/samsung/clk-exynos5420.c | 4 +-
5335 drivers/clk/socfpga/clk.c | 4 +-
5336 drivers/clk/sunxi/clk-factors.c | 4 +-
5337 drivers/clk/sunxi/clk-sunxi.c | 58 +-
5338 drivers/clk/tegra/Makefile | 7 +-
5339 drivers/clk/tegra/clk-id.h | 235 +++
5340 drivers/clk/tegra/clk-periph-gate.c | 8 +-
5341 drivers/clk/tegra/clk-periph.c | 32 +-
5342 drivers/clk/tegra/clk-pll.c | 407 +++--
5343 drivers/clk/tegra/clk-tegra-audio.c | 215 +++
5344 drivers/clk/tegra/clk-tegra-fixed.c | 111 ++
5345 drivers/clk/tegra/clk-tegra-periph.c | 674 ++++++++
5346 drivers/clk/tegra/clk-tegra-pmc.c | 132 ++
5347 drivers/clk/tegra/clk-tegra-super-gen4.c | 149 ++
5348 drivers/clk/tegra/clk-tegra114.c | 1687 +++++---------------
5349 drivers/clk/tegra/clk-tegra124.c | 1424 +++++++++++++++++
5350 drivers/clk/tegra/clk-tegra20.c | 818 ++++------
5351 drivers/clk/tegra/clk-tegra30.c | 1506 ++++++-----------
5352 drivers/clk/tegra/clk.c | 166 ++
5353 drivers/clk/tegra/clk.h | 115 +-
5354 include/dt-bindings/clock/tegra114-car.h | 8 +-
5355 include/dt-bindings/clock/tegra124-car.h | 341 ++++
5356 include/dt-bindings/clock/tegra30-car.h | 10 +-
5357 27 files changed, 5174 insertions(+), 3035 deletions(-)
5358 create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-car.txt
5359 create mode 100644 drivers/clk/tegra/clk-id.h
5360 create mode 100644 drivers/clk/tegra/clk-tegra-audio.c
5361 create mode 100644 drivers/clk/tegra/clk-tegra-fixed.c
5362 create mode 100644 drivers/clk/tegra/clk-tegra-periph.c
5363 create mode 100644 drivers/clk/tegra/clk-tegra-pmc.c
5364 create mode 100644 drivers/clk/tegra/clk-tegra-super-gen4.c
5365 create mode 100644 drivers/clk/tegra/clk-tegra124.c
5366 create mode 100644 include/dt-bindings/clock/tegra124-car.h
5367 Merging random/dev (8ea43ef26598 random: clarify bits/bytes in wakeup thresholds)
5368 $ git merge random/dev
5369 Merge made by the 'recursive' strategy.
5370 drivers/char/random.c | 176 ++++++++++++++++++++++----------------------------
5371 1 file changed, 76 insertions(+), 100 deletions(-)
5372 Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
5373 $ git merge lzo-update/lzo-update
5374 Merge made by the 'recursive' strategy.
5375 lib/lzo/lzo1x_decompress_safe.c | 4 ++++
5376 lib/lzo/lzodefs.h | 6 ++++++
5377 2 files changed, 10 insertions(+)
5378 Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
5379 $ git merge arm64-hugepages/for-next/hugepages
5381 Merging aio/master (374b105797c3 Linux 3.13-rc3)
5382 $ git merge aio/master
5384 Merging akpm-current/current (6e7ebeb1cb49 lib/decompress_unlz4.c: always set an error return code on failures)
5385 $ git merge --no-ff akpm-current/current
5386 Resolved 'arch/um/kernel/sysrq.c' using previous resolution.
5387 Resolved 'kernel/params.c' using previous resolution.
5388 Auto-merging mm/memcontrol.c
5389 Auto-merging kernel/params.c
5390 CONFLICT (content): Merge conflict in kernel/params.c
5391 Auto-merging kernel/kexec.c
5392 Auto-merging kernel/fork.c
5393 Auto-merging include/linux/sched.h
5394 Auto-merging include/linux/mm.h
5395 Auto-merging include/linux/blkdev.h
5396 Removing include/asm-generic/int-l64.h
5397 Removing fs/coredump.h
5398 Auto-merging drivers/misc/ti-st/st_core.c
5399 Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
5400 Auto-merging block/blk-mq.c
5401 Auto-merging arch/um/kernel/sysrq.c
5402 CONFLICT (content): Merge conflict in arch/um/kernel/sysrq.c
5403 Auto-merging MAINTAINERS
5404 Automatic merge failed; fix conflicts and then commit the result.
5406 [master 714c128e9f60] Merge branch 'akpm-current/current'
5407 $ git diff -M --stat --summary HEAD^..
5408 Documentation/dynamic-debug-howto.txt | 9 +
5409 Documentation/filesystems/proc.txt | 9 +
5410 Documentation/filesystems/sysfs.txt | 6 +-
5411 Documentation/leds/leds-class.txt | 3 -
5413 arch/ia64/include/asm/processor.h | 1 +
5414 arch/sh/kernel/dwarf.c | 18 +-
5415 block/blk-mq-cpu.c | 37 +---
5416 block/blk-mq.c | 68 +-----
5417 block/blk-mq.h | 1 -
5418 block/cmdline-parser.c | 107 ++++++---
5419 block/genhd.c | 2 +-
5420 drivers/block/cciss.c | 4 +-
5421 drivers/block/paride/pg.c | 2 +-
5422 drivers/block/sx8.c | 16 +-
5423 drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
5424 drivers/gpu/drm/drm_edid_load.c | 4 +-
5425 drivers/gpu/drm/drm_fb_helper.c | 8 +
5426 drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 +
5427 drivers/input/Kconfig | 9 +
5428 drivers/input/Makefile | 3 +
5429 drivers/input/input.c | 6 +
5430 drivers/input/leds.c | 247 +++++++++++++++++++++
5431 drivers/leds/Kconfig | 3 -
5432 drivers/mailbox/omap-mbox.h | 2 +-
5433 drivers/memstick/host/rtsx_pci_ms.c | 30 ++-
5434 drivers/misc/ti-st/st_core.c | 2 +-
5435 drivers/mtd/ubi/attach.c | 49 +----
5436 drivers/mtd/ubi/wl.c | 25 +--
5437 drivers/net/irda/donauboe.c | 15 +-
5438 drivers/pps/pps.c | 57 ++---
5439 drivers/rtc/rtc-as3722.c | 19 +-
5440 drivers/rtc/rtc-at91rm9200.c | 2 +
5441 drivers/rtc/rtc-at91sam9.c | 2 +-
5442 drivers/rtc/rtc-s5m.c | 54 ++---
5443 drivers/scsi/megaraid/megaraid_mm.c | 2 +
5444 drivers/tty/Kconfig | 4 +
5445 drivers/tty/vt/keyboard.c | 110 +++++++---
5446 drivers/w1/masters/w1-gpio.c | 22 ++
5447 drivers/w1/w1_int.c | 12 -
5448 fs/autofs4/autofs_i.h | 4 +-
5449 fs/autofs4/dev-ioctl.c | 16 +-
5450 fs/autofs4/inode.c | 36 ++-
5451 fs/autofs4/waitq.c | 16 +-
5452 fs/binfmt_elf.c | 21 +-
5455 fs/exec.c | 115 ++--------
5456 fs/ext3/dir.c | 36 +--
5457 fs/ext4/block_validity.c | 33 +--
5458 fs/ext4/dir.c | 35 +--
5459 fs/fat/cache.c | 25 ++-
5461 fs/fat/file.c | 91 +++++++-
5462 fs/fat/inode.c | 35 ++-
5463 fs/jffs2/nodelist.c | 28 +--
5464 fs/jffs2/readinode.c | 26 +--
5465 fs/ocfs2/alloc.c | 40 +++-
5466 fs/ocfs2/cluster/tcp.c | 13 +-
5467 fs/ocfs2/file.c | 60 +++--
5468 fs/ocfs2/localalloc.c | 40 ++++
5469 fs/ocfs2/localalloc.h | 6 +
5470 fs/ocfs2/namei.c | 12 +-
5471 fs/posix_acl.c | 84 ++++++-
5472 fs/proc/array.c | 18 +-
5473 fs/proc/base.c | 69 +++---
5474 fs/proc/meminfo.c | 37 ++++
5475 fs/ramfs/file-mmu.c | 7 -
5476 fs/ramfs/file-nommu.c | 17 +-
5477 fs/ramfs/inode.c | 7 +
5478 fs/ramfs/internal.h | 1 -
5479 fs/ubifs/debug.c | 22 +-
5480 fs/ubifs/log.c | 21 +-
5481 fs/ubifs/orphan.c | 21 +-
5482 fs/ubifs/recovery.c | 21 +-
5483 fs/ubifs/super.c | 24 +-
5484 fs/ubifs/tnc.c | 22 +-
5485 include/asm-generic/int-l64.h | 49 -----
5486 include/linux/blkdev.h | 5 +-
5487 include/linux/cache.h | 4 +-
5488 include/linux/cmdline-parser.h | 8 +-
5489 include/linux/crc64_ecma.h | 56 +++++
5490 include/linux/huge_mm.h | 23 ++
5491 include/linux/hugetlb.h | 12 +-
5492 include/linux/input.h | 21 ++
5493 include/linux/kthread.h | 1 +
5494 include/linux/mm.h | 41 +++-
5495 include/linux/mmzone.h | 6 +
5496 include/linux/page-flags.h | 4 +-
5497 include/linux/parser.h | 1 +
5498 include/linux/posix_acl.h | 78 +------
5499 include/linux/printk.h | 19 +-
5500 include/linux/ramfs.h | 7 -
5501 include/linux/reboot.h | 1 +
5502 include/linux/sched.h | 28 ++-
5503 include/linux/smp.h | 6 +-
5504 include/linux/w1-gpio.h | 1 +
5505 include/uapi/asm-generic/types.h | 3 +-
5508 kernel/kexec.c | 3 +-
5509 kernel/kmod.c | 11 +-
5510 kernel/kthread.c | 9 +
5511 kernel/params.c | 2 +-
5512 kernel/reboot.c | 2 +-
5513 kernel/signal.c | 7 +-
5514 kernel/smp.c | 51 ++---
5516 kernel/time/sched_clock.c | 4 +
5517 kernel/watchdog.c | 10 +-
5520 lib/cmdline.c | 14 +-
5521 lib/crc64_ecma.c | 341 +++++++++++++++++++++++++++++
5522 lib/decompress_unlz4.c | 1 +
5523 lib/dma-debug.c | 7 +
5524 lib/dynamic_debug.c | 15 +-
5526 lib/parser.c | 62 +++++-
5527 lib/rbtree_test.c | 13 +-
5528 mm/hugetlb.c | 36 +--
5529 mm/internal.h | 3 +-
5530 mm/memcontrol.c | 23 +-
5531 mm/memory-failure.c | 2 +-
5533 mm/page_alloc.c | 13 ++
5534 mm/swap.c | 278 ++++++++++++-----------
5535 mm/swap_state.c | 63 +++++-
5536 mm/swapfile.c | 20 +-
5537 net/netfilter/ipset/ip_set_hash_netiface.c | 27 +--
5538 scripts/checkpatch.pl | 9 +
5539 scripts/get_maintainer.pl | 91 +++++++-
5540 132 files changed, 2291 insertions(+), 1293 deletions(-)
5541 create mode 100644 drivers/input/leds.c
5542 delete mode 100644 fs/coredump.h
5543 delete mode 100644 include/asm-generic/int-l64.h
5544 create mode 100644 include/linux/crc64_ecma.h
5545 create mode 100644 lib/crc64_ecma.c
5546 $ git clone -s -l -n -q . ../rebase-tmp
5548 $ git checkout -b akpm remotes/origin/akpm/master
5549 Switched to a new branch 'akpm'
5550 $ git rebase --onto master remotes/origin/akpm/master-base
5551 First, rewinding head to replay your work on top of it...
5552 Applying: mm: add strictlimit knob
5554 $ git fetch -f ../rebase-tmp akpm:akpm/master
5556 + a78073fc717c...6b44e45c97e1 akpm -> akpm/master (forced update)
5557 $ rm -rf ../rebase-tmp
5558 Merging akpm/master (6b44e45c97e1 mm: add strictlimit knob)
5559 $ git merge --no-ff akpm/master
5560 Merge made by the 'recursive' strategy.
5561 Documentation/ABI/testing/sysfs-class-bdi | 8 +++++++
5562 mm/backing-dev.c | 35 +++++++++++++++++++++++++++++++
5563 2 files changed, 43 insertions(+)
5564 $ git revert 436aa86f0414
5565 [master 66f8a5ea7bc9] Revert "ASoC: eukrea-tlv320: Add DT support."
5566 3 files changed, 13 insertions(+), 121 deletions(-)
5567 delete mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt
projects / karo-tx-linux.git / blob