2 Friday 26 October 10:48:19 EST 2012
5 $ git reset --hard stable
6 HEAD is now at 0e9e3e3 Merge tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
7 Merging origin/master (2ab3f29 Merge branch 'akpm' (Andrew's fixes))
8 $ git merge origin/master
9 Updating 0e9e3e3..2ab3f29
11 .../bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 +-
12 .../bindings/pinctrl/nvidia,tegra30-pinmux.txt | 2 +-
13 arch/arm/Kconfig | 9 +-
14 arch/arm/Makefile | 13 +--
15 arch/arm/boot/Makefile | 10 +--
16 arch/arm/include/asm/dma-mapping.h | 1 +
17 arch/arm/include/asm/flat.h | 2 +-
18 arch/arm/include/asm/uaccess.h | 4 +-
19 arch/arm/kernel/irq.c | 2 +
20 arch/arm/kernel/kprobes-test-arm.c | 4 +
21 arch/arm/kernel/machine_kexec.c | 7 +-
22 arch/arm/kernel/perf_event.c | 4 +
23 arch/arm/kernel/smp.c | 14 +++-
24 arch/arm/kernel/smp_twd.c | 4 +-
25 arch/arm/lib/delay.c | 1 +
26 arch/arm/mm/alignment.c | 4 +-
27 arch/arm/mm/dma-mapping.c | 2 +-
28 arch/arm/mm/vmregion.h | 1 -
29 arch/arm/tools/Makefile | 2 +-
30 drivers/base/Kconfig | 2 +-
31 drivers/base/dma-coherent.c | 5 +-
32 drivers/base/dma-contiguous.c | 5 +-
33 drivers/dma/Kconfig | 11 +++
34 drivers/dma/dw_dmac_regs.h | 18 ++--
35 drivers/edac/amd64_edac.c | 11 +--
36 drivers/input/tablet/wacom_sys.c | 51 +++++++++++-
37 drivers/input/tablet/wacom_wac.c | 88 +++++++++++++++++++-
38 drivers/input/tablet/wacom_wac.h | 5 ++
39 drivers/iommu/amd_iommu_init.c | 39 +++++++--
40 drivers/iommu/tegra-smmu.c | 2 +-
41 drivers/pinctrl/core.c | 4 +-
42 drivers/pinctrl/pinconf.c | 4 -
43 drivers/pinctrl/pinctrl-nomadik.c | 6 +-
44 drivers/pinctrl/pinctrl-tegra.c | 2 +-
45 drivers/pinctrl/pinctrl-tegra30.c | 24 +++---
46 drivers/rtc/rtc-imxdi.c | 2 +
47 drivers/spi/spi-pl022.c | 3 -
48 drivers/spi/spi-rspi.c | 56 ++++++++-----
49 drivers/video/backlight/Kconfig | 3 +-
50 drivers/xen/Kconfig | 2 +
51 fs/compat_ioctl.c | 2 +
52 include/linux/rbtree_augmented.h | 1 +
53 include/linux/spi/tsc2005.h | 2 -
54 kernel/Makefile | 6 +-
55 kernel/cgroup.c | 41 +++------
56 kernel/pid_namespace.c | 12 ++-
57 kernel/workqueue.c | 2 +-
59 mm/mmu_notifier.c | 26 +++---
60 mm/page_alloc.c | 6 +-
62 security/apparmor/policy.c | 24 +++++-
63 security/device_cgroup.c | 87 +++++++++++++------
64 tools/testing/selftests/epoll/test_epoll.c | 4 +-
65 tools/vm/page-types.c | 2 +-
66 usr/gen_init_cpio.c | 43 +++++-----
67 56 files changed, 486 insertions(+), 225 deletions(-)
68 Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
69 $ git merge fixes/master
71 Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
72 $ git merge kbuild-current/rc-fixes
73 Merge made by the 'recursive' strategy.
74 scripts/kconfig/expr.h | 5 +--
75 scripts/kconfig/list.h | 91 +++++++++++++++++++++++++++++++++++++++++++
76 scripts/kconfig/lkc_proto.h | 4 +-
77 scripts/kconfig/mconf.c | 6 +--
78 scripts/kconfig/menu.c | 14 ++++---
79 5 files changed, 106 insertions(+), 14 deletions(-)
80 create mode 100644 scripts/kconfig/list.h
81 Merging arm-current/fixes (b43b1ff Merge tag 'fixes-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes)
82 $ git merge arm-current/fixes
84 Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
85 $ git merge m68k-current/for-linus
87 Merging powerpc-merge/merge (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
88 $ git merge powerpc-merge/merge
90 Merging sparc/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
91 $ git merge sparc/master
93 Merging net/master (910a578 vhost: fix mergeable bufs on BE hosts)
94 $ git merge net/master
95 Auto-merging MAINTAINERS
96 Merge made by the 'recursive' strategy.
98 drivers/bcma/main.c | 5 +-
99 drivers/net/can/flexcan.c | 19 ++-
100 drivers/net/can/sja1000/peak_pci.c | 13 +-
101 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 +++
102 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 +---
103 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +
104 drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +-
105 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 116 ++++---------
106 drivers/net/ethernet/qlogic/qla3xxx.c | 9 +-
107 drivers/net/ethernet/ti/Kconfig | 2 +-
108 drivers/net/phy/Kconfig | 5 +
109 drivers/net/phy/Makefile | 1 +
110 drivers/net/phy/at803x.c | 176 ++++++++++++++++++++
111 drivers/net/usb/ipheth.c | 5 +
112 drivers/net/usb/qmi_wwan.c | 41 +++++
113 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +-
114 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 68 +++-----
115 drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
116 drivers/net/wireless/iwlwifi/dvm/devices.c | 39 +++--
117 drivers/vhost/net.c | 3 +-
118 include/linux/tcp.h | 3 +-
119 include/net/cfg80211.h | 1 +
120 include/uapi/linux/tcp.h | 1 +
121 net/8021q/vlan.c | 4 +-
122 net/batman-adv/bridge_loop_avoidance.c | 27 ++-
123 net/batman-adv/routing.c | 8 +-
124 net/batman-adv/types.h | 2 +
125 net/bluetooth/smp.c | 6 +-
126 net/core/skbuff.c | 6 +-
127 net/ipv4/route.c | 9 +-
128 net/ipv4/tcp.c | 10 +-
129 net/ipv4/tcp_input.c | 13 +-
130 net/ipv4/tcp_ipv4.c | 1 +
131 net/ipv4/tcp_minisocks.c | 1 +
132 net/ipv4/tcp_timer.c | 4 +-
133 net/ipv6/route.c | 4 +-
134 net/mac80211/iface.c | 2 +-
135 net/mac80211/mlme.c | 35 ++--
136 net/mac80211/sta_info.c | 4 +-
137 net/mac80211/util.c | 4 +-
138 net/mac80211/wpa.c | 14 +-
139 net/netfilter/ipvs/ip_vs_ctl.c | 3 +-
140 net/netfilter/xt_CT.c | 10 +-
141 net/netfilter/xt_TEE.c | 1 +
142 net/netfilter/xt_nat.c | 8 +-
143 net/netlink/af_netlink.c | 19 ++-
144 net/wireless/mlme.c | 12 +-
145 48 files changed, 529 insertions(+), 250 deletions(-)
146 create mode 100644 drivers/net/phy/at803x.c
147 Merging sound-current/for-linus (c64064c Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
148 $ git merge sound-current/for-linus
149 Merge made by the 'recursive' strategy.
150 sound/isa/opti9xx/miro.c | 1 -
151 sound/pci/als300.c | 4 +
152 sound/pci/hda/patch_realtek.c | 20 +++-
153 sound/pci/rme9652/hdspm.c | 234 +++++++++++++++++++++++----------------
154 sound/soc/codecs/wm8994.c | 18 ++-
155 sound/soc/codecs/wm8994.h | 1 +
156 sound/soc/ux500/mop500.c | 17 +++
157 sound/soc/ux500/ux500_msp_i2s.c | 8 +-
158 8 files changed, 200 insertions(+), 103 deletions(-)
159 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
160 $ git merge pci-current/for-linus
162 Merging wireless/master (f89ff64 b43: Fix oops on unload when firmware not found)
163 $ git merge wireless/master
164 Merge made by the 'recursive' strategy.
165 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 ++++++++++----------
166 drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
167 drivers/net/wireless/b43/main.c | 4 +
168 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
169 drivers/net/wireless/mwifiex/cfg80211.c | 7 +-
170 drivers/net/wireless/mwifiex/scan.c | 13 +-
171 drivers/net/wireless/rt2x00/rt2500usb.c | 1 +
172 drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
173 drivers/net/wireless/rt2x00/rt73usb.c | 1 +
174 drivers/net/wireless/rtlwifi/usb.c | 2 +-
175 10 files changed, 102 insertions(+), 94 deletions(-)
176 Merging driver-core.current/driver-core-linus (bf34be0 Documentation:Chinese translation of Documentation/arm64/memory.txt)
177 $ git merge driver-core.current/driver-core-linus
178 Merge made by the 'recursive' strategy.
179 Documentation/firmware_class/README | 26 ++--
180 Documentation/zh_CN/IRQ.txt | 39 +++++
181 Documentation/zh_CN/arm64/booting.txt | 156 +++++++++++++++++++
182 Documentation/zh_CN/arm64/memory.txt | 93 ++++++++++++
183 drivers/base/firmware_class.c | 266 +++++++++++++++++++--------------
184 fs/sysfs/dir.c | 16 +-
185 include/linux/dynamic_debug.h | 2 +-
186 7 files changed, 465 insertions(+), 133 deletions(-)
187 create mode 100644 Documentation/zh_CN/IRQ.txt
188 create mode 100644 Documentation/zh_CN/arm64/booting.txt
189 create mode 100644 Documentation/zh_CN/arm64/memory.txt
190 Merging tty.current/tty-linus (a4f7438 Revert "serial: omap: fix software flow control")
191 $ git merge tty.current/tty-linus
192 Merge made by the 'recursive' strategy.
193 arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++--
194 drivers/tty/serial/omap-serial.c | 12 ++++++------
195 2 files changed, 8 insertions(+), 8 deletions(-)
196 Merging usb.current/usb-linus (1d63f24 Merge tag 'for-usb-linus-2012-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus)
197 $ git merge usb.current/usb-linus
198 Merge made by the 'recursive' strategy.
199 drivers/usb/core/hub.c | 7 +-
200 drivers/usb/gadget/net2272.c | 4 +-
201 drivers/usb/host/pci-quirks.c | 9 +-
202 drivers/usb/host/xhci-dbg.c | 2 -
203 drivers/usb/host/xhci-hub.c | 9 +-
204 drivers/usb/host/xhci-ring.c | 11 +
205 drivers/usb/host/xhci.c | 8 +-
206 drivers/usb/misc/ezusb.c | 1 +
207 drivers/usb/musb/musb_dsps.c | 8 +-
208 drivers/usb/renesas_usbhs/fifo.c | 1 +
209 drivers/usb/renesas_usbhs/mod_host.c | 5 +
210 drivers/usb/serial/ch341.c | 23 +-
211 drivers/usb/serial/digi_acceleport.c | 117 ++++----
212 drivers/usb/serial/ipw.c | 7 +-
213 drivers/usb/serial/keyspan.c | 181 ++++++-------
214 drivers/usb/serial/keyspan.h | 8 +
215 drivers/usb/serial/mct_u232.c | 59 ++--
216 drivers/usb/serial/metro-usb.c | 65 ++---
217 drivers/usb/serial/mos7720.c | 62 ++---
218 drivers/usb/serial/mos7840.c | 495 ++++++++++++++--------------------
219 drivers/usb/serial/omninet.c | 36 +--
220 drivers/usb/serial/opticon.c | 11 +-
221 drivers/usb/serial/option.c | 23 +-
222 drivers/usb/serial/qcserial.c | 33 +--
223 drivers/usb/serial/quatech2.c | 135 +++++-----
224 drivers/usb/serial/sierra.c | 133 ++++-----
225 drivers/usb/serial/usb-wwan.h | 2 +-
226 drivers/usb/serial/usb_wwan.c | 124 ++++-----
227 drivers/usb/serial/whiteheat.c | 60 ++---
228 drivers/usb/storage/unusual_devs.h | 6 +
229 30 files changed, 798 insertions(+), 847 deletions(-)
230 Merging staging.current/staging-linus (4d3f120 staging: tidspbridge: delete unused mmu functions)
231 $ git merge staging.current/staging-linus
232 Merge made by the 'recursive' strategy.
233 drivers/iio/Kconfig | 1 -
234 drivers/iio/Makefile | 1 -
235 drivers/staging/android/binder.c | 30 ++++-
236 drivers/staging/comedi/drivers/8255_pci.c | 2 +
237 drivers/staging/comedi/drivers/amplc_dio200.c | 2 +
238 drivers/staging/comedi/drivers/amplc_pc236.c | 5 +-
239 drivers/staging/comedi/drivers/amplc_pc263.c | 2 +
240 drivers/staging/comedi/drivers/das08.c | 2 +
241 drivers/staging/comedi/drivers/ni_daq_700.c | 2 +-
242 drivers/staging/comedi/drivers/ni_labpc.c | 2 +
243 drivers/staging/iio/accel/adis16201_core.c | 24 ++--
244 drivers/staging/iio/accel/adis16203_core.c | 20 ++--
245 drivers/staging/iio/accel/adis16204_core.c | 22 ++--
246 drivers/staging/iio/accel/adis16209_core.c | 18 +--
247 drivers/staging/iio/accel/adis16220_core.c | 19 ++--
248 drivers/staging/iio/accel/adis16240_core.c | 23 ++--
249 drivers/staging/iio/gyro/adis16260_core.c | 29 +++--
250 drivers/staging/iio/imu/adis16400.h | 2 +
251 drivers/staging/iio/imu/adis16400_core.c | 70 +++++++-----
252 drivers/staging/ipack/bridges/tpci200.c | 1 +
253 drivers/staging/omapdrm/omap_gem.c | 4 +-
254 drivers/staging/ramster/Kconfig | 1 +
255 drivers/staging/tidspbridge/core/tiomap3430.c | 37 +++++--
256 drivers/staging/tidspbridge/hw/hw_mmu.c | 115 ++++----------------
257 drivers/staging/tidspbridge/hw/hw_mmu.h | 31 +++---
258 .../tidspbridge/include/dspbridge/cfgdefs.h | 4 +-
259 .../tidspbridge/include/dspbridge/host_os.h | 4 +-
260 drivers/staging/tidspbridge/rmgr/drv.c | 8 +-
261 drivers/staging/tidspbridge/rmgr/node.c | 21 +++-
262 drivers/staging/zram/zram_drv.c | 12 +-
263 include/linux/iio/iio.h | 16 +++
264 31 files changed, 287 insertions(+), 243 deletions(-)
265 Merging char-misc.current/char-misc-linus (2cb55a2 sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP)
266 $ git merge char-misc.current/char-misc-linus
267 Merge made by the 'recursive' strategy.
268 drivers/char/sonypi.c | 2 +-
269 drivers/extcon/extcon-adc-jack.c | 10 ++-
270 drivers/extcon/extcon-class.c | 142 ++++++++++++++++++++++----------------
271 drivers/extcon/extcon-gpio.c | 1 -
272 drivers/extcon/extcon-max77693.c | 46 ++++++++----
273 drivers/extcon/extcon-max8997.c | 6 +-
274 drivers/hv/channel.c | 24 ++++---
275 include/linux/extcon.h | 2 +-
276 include/linux/mfd/max77693.h | 13 ++++
277 9 files changed, 152 insertions(+), 94 deletions(-)
278 Merging input-current/for-linus (88fd449 Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD)
279 $ git merge input-current/for-linus
280 Auto-merging drivers/input/tablet/wacom_wac.c
281 Merge made by the 'recursive' strategy.
282 .../bindings/input/touchscreen/egalax-ts.txt | 19 ++++++++++++++++
283 drivers/input/tablet/wacom_wac.c | 3 +++
284 drivers/input/touchscreen/Kconfig | 2 +-
285 drivers/input/touchscreen/egalax_ts.c | 23 ++++++++++++++++++--
286 4 files changed, 44 insertions(+), 3 deletions(-)
287 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt
288 Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape delays.)
289 $ git merge md-current/for-linus
291 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
292 $ git merge audit-current/for-linus
294 Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
295 $ git merge crypto-current/master
296 Merge made by the 'recursive' strategy.
297 crypto/cryptd.c | 11 ++++++++---
298 1 file changed, 8 insertions(+), 3 deletions(-)
299 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
300 $ git merge ide/master
302 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
303 $ git merge dwmw2/master
305 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
306 $ git merge sh-current/sh-fixes-for-linus
308 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
309 $ git merge irqdomain-current/irqdomain/merge
311 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
312 $ git merge devicetree-current/devicetree/merge
313 Auto-merging drivers/of/base.c
314 Merge made by the 'recursive' strategy.
315 drivers/of/base.c | 2 ++
316 1 file changed, 2 insertions(+)
317 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
318 $ git merge spi-current/spi/merge
319 Auto-merging drivers/spi/spi.c
320 Auto-merging drivers/spi/spi-s3c64xx.c
321 Auto-merging drivers/spi/spi-bcm63xx.c
322 Merge made by the 'recursive' strategy.
323 drivers/spi/spi-bcm63xx.c | 16 ++++++----------
324 drivers/spi/spi-s3c64xx.c | 10 ++++------
325 drivers/spi/spi.c | 5 ++++-
326 3 files changed, 14 insertions(+), 17 deletions(-)
327 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
328 $ git merge gpio-current/gpio/merge
330 Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
331 $ git merge asm-generic/master
332 Merge made by the 'recursive' strategy.
333 arch/openrisc/include/asm/io.h | 1 +
334 include/asm-generic/io.h | 1 -
335 2 files changed, 1 insertion(+), 1 deletion(-)
336 Merging arm/for-next (4a83d2e Merge remote-tracking branch 'wildea/asids' into for-next)
337 $ git merge arm/for-next
338 Merge made by the 'recursive' strategy.
339 arch/arm/common/vic.c | 18 +-
340 arch/arm/include/asm/hardware/cache-l2x0.h | 5 +
341 arch/arm/include/asm/hardware/vic.h | 2 +-
342 arch/arm/include/asm/mmu.h | 11 +-
343 arch/arm/include/asm/mmu_context.h | 82 +-------
344 arch/arm/kernel/process.c | 1 +
345 arch/arm/mm/cache-aurora-l2.h | 55 ++++++
346 arch/arm/mm/cache-l2x0.c | 277 +++++++++++++++++++++++++---
347 arch/arm/mm/context.c | 207 +++++++++++----------
348 arch/arm/mm/proc-v7.S | 2 +-
349 drivers/mmc/host/mmci.c | 40 ++--
350 11 files changed, 456 insertions(+), 244 deletions(-)
351 create mode 100644 arch/arm/mm/cache-aurora-l2.h
352 Merging arm-perf/for-next/perf (eab8fc8 Merge branch 'hw-breakpoint' into for-next/perf)
353 $ git merge arm-perf/for-next/perf
354 Auto-merging arch/arm/kernel/perf_event.c
355 Merge made by the 'recursive' strategy.
356 arch/arm/include/asm/hw_breakpoint.h | 8 +-
357 arch/arm/include/asm/perf_event.h | 5 +
358 arch/arm/include/asm/pmu.h | 28 ++--
359 arch/arm/kernel/hw_breakpoint.c | 146 ++++++++++----------
360 arch/arm/kernel/perf_event.c | 84 ++++++++----
361 arch/arm/kernel/perf_event_cpu.c | 74 ++++++----
362 arch/arm/kernel/perf_event_v6.c | 126 ++++++++---------
363 arch/arm/kernel/perf_event_v7.c | 246 ++++++++++++++++------------------
364 arch/arm/kernel/perf_event_xscale.c | 157 +++++++++++-----------
365 9 files changed, 466 insertions(+), 408 deletions(-)
366 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
367 $ git merge davinci/davinci-next
369 Merging xilinx/arm-next (6f0c058 Linux 3.7-rc2)
370 $ git merge xilinx/arm-next
372 Merging arm64/upstream (1e4097b arm64: Make the user fault reporting more specific)
373 $ git merge arm64/upstream
374 Merge made by the 'recursive' strategy.
375 Documentation/arm64/memory.txt | 12 ++++++------
376 arch/arm64/include/asm/io.h | 8 ++++----
377 arch/arm64/mm/fault.c | 13 +++++++++++--
378 3 files changed, 21 insertions(+), 12 deletions(-)
379 Merging blackfin/for-linus (cdc0584 Blackfin: twi: Add missing __iomem annotation)
380 $ git merge blackfin/for-linus
381 Removing arch/blackfin/include/asm/kvm_para.h
382 Merge made by the 'recursive' strategy.
383 arch/blackfin/include/asm/Kbuild | 6 +-
384 arch/blackfin/include/asm/bfin_sport.h | 128 +-----
385 arch/blackfin/include/asm/bfin_twi.h | 2 +-
386 arch/blackfin/include/asm/fixed_code.h | 30 +-
387 arch/blackfin/include/asm/kvm_para.h | 1 -
388 arch/blackfin/include/asm/ptrace.h | 161 +-------
389 arch/blackfin/include/asm/uaccess.h | 24 +-
390 arch/blackfin/include/asm/unistd.h | 430 +------------------
391 arch/blackfin/include/uapi/asm/Kbuild | 16 +
392 arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
393 arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
394 arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
395 arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
396 arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
397 arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
398 arch/blackfin/include/{ => uapi}/asm/poll.h | 0
399 arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
400 arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
401 arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
402 arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
403 arch/blackfin/include/{ => uapi}/asm/signal.h | 0
404 arch/blackfin/include/{ => uapi}/asm/stat.h | 0
405 arch/blackfin/include/{ => uapi}/asm/swab.h | 0
406 arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
407 24 files changed, 816 insertions(+), 763 deletions(-)
408 delete mode 100644 arch/blackfin/include/asm/kvm_para.h
409 create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
410 rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
411 rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
412 rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
413 create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
414 rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
415 rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
416 rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
417 create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
418 rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
419 rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
420 rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
421 rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
422 rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
423 create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
424 Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
425 $ git merge c6x/for-linux-next
427 Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
428 $ git merge cris/for-next
429 Auto-merging arch/cris/include/asm/Kbuild
430 Merge made by the 'recursive' strategy.
431 arch/cris/include/arch-v10/arch/Kbuild | 5 +-
432 arch/cris/include/arch-v32/arch/Kbuild | 3 +-
433 arch/cris/include/arch-v32/arch/cryptocop.h | 116 +------
434 arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
435 arch/cris/include/asm/Kbuild | 5 -
436 arch/cris/include/asm/ptrace.h | 5 +-
437 arch/cris/include/asm/signal.h | 122 +------
438 arch/cris/include/asm/swab.h | 3 +-
439 arch/cris/include/asm/termios.h | 43 +--
440 arch/cris/include/asm/types.h | 5 +-
441 arch/cris/include/asm/unistd.h | 342 +------------------
442 arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 +
443 .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0
444 .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0
445 .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0
446 arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0
447 arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 +
448 arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 +++++++
449 arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0
450 arch/cris/include/uapi/asm/Kbuild | 34 ++
451 arch/cris/include/{ => uapi}/asm/auxvec.h | 0
452 arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0
453 arch/cris/include/{ => uapi}/asm/byteorder.h | 0
454 arch/cris/include/{ => uapi}/asm/errno.h | 0
455 arch/cris/include/{ => uapi}/asm/ethernet.h | 0
456 arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0
457 arch/cris/include/{ => uapi}/asm/fcntl.h | 0
458 arch/cris/include/{ => uapi}/asm/ioctl.h | 0
459 arch/cris/include/{ => uapi}/asm/ioctls.h | 0
460 arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0
461 arch/cris/include/{ => uapi}/asm/mman.h | 0
462 arch/cris/include/{ => uapi}/asm/msgbuf.h | 0
463 arch/cris/include/{ => uapi}/asm/param.h | 0
464 arch/cris/include/{ => uapi}/asm/poll.h | 0
465 arch/cris/include/{ => uapi}/asm/posix_types.h | 0
466 arch/cris/include/uapi/asm/ptrace.h | 1 +
467 arch/cris/include/{ => uapi}/asm/resource.h | 0
468 arch/cris/include/{ => uapi}/asm/rs485.h | 0
469 arch/cris/include/{ => uapi}/asm/sembuf.h | 0
470 arch/cris/include/{ => uapi}/asm/setup.h | 0
471 arch/cris/include/{ => uapi}/asm/shmbuf.h | 0
472 arch/cris/include/{ => uapi}/asm/sigcontext.h | 0
473 arch/cris/include/{ => uapi}/asm/siginfo.h | 0
474 arch/cris/include/uapi/asm/signal.h | 122 +++++++
475 arch/cris/include/{ => uapi}/asm/socket.h | 0
476 arch/cris/include/{ => uapi}/asm/sockios.h | 0
477 arch/cris/include/{ => uapi}/asm/stat.h | 0
478 arch/cris/include/{ => uapi}/asm/statfs.h | 0
479 arch/cris/include/uapi/asm/swab.h | 3 +
480 arch/cris/include/{ => uapi}/asm/sync_serial.h | 0
481 arch/cris/include/{ => uapi}/asm/termbits.h | 0
482 arch/cris/include/uapi/asm/termios.h | 45 +++
483 arch/cris/include/uapi/asm/types.h | 1 +
484 arch/cris/include/uapi/asm/unistd.h | 344 ++++++++++++++++++++
485 arch/cris/kernel/asm-offsets.c | 6 +-
486 55 files changed, 689 insertions(+), 646 deletions(-)
487 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
488 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
489 rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
490 rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
491 create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
492 rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
493 rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
494 rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
495 rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
496 rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
497 rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
498 rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
499 rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
500 rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
501 rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
502 rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
503 rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
504 rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
505 rename arch/cris/include/{ => uapi}/asm/param.h (100%)
506 rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
507 rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
508 create mode 100644 arch/cris/include/uapi/asm/ptrace.h
509 rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
510 rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
511 rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
512 rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
513 rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
514 rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
515 rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
516 create mode 100644 arch/cris/include/uapi/asm/signal.h
517 rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
518 rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
519 rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
520 rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
521 create mode 100644 arch/cris/include/uapi/asm/swab.h
522 rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
523 rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
524 create mode 100644 arch/cris/include/uapi/asm/termios.h
525 create mode 100644 arch/cris/include/uapi/asm/types.h
526 create mode 100644 arch/cris/include/uapi/asm/unistd.h
527 Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
528 $ git merge hexagon/linux-next
530 Merging ia64/next (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next)
531 $ git merge ia64/next
533 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
534 $ git merge m68k/for-next
536 Merging m68knommu/for-next (165d4c9 m68knommu: disable MC68000 cpu target when MMU is selected)
537 $ git merge m68knommu/for-next
538 Removing arch/m68k/platform/68VZ328/Makefile
539 Removing arch/m68k/platform/68EZ328/Makefile
540 Removing arch/m68k/platform/68328/head-rom.S
541 Removing arch/m68k/platform/68328/head-ram.S
542 Removing arch/m68k/platform/68328/head-pilot.S
543 Removing arch/m68k/platform/68328/head-de2.S
544 Removing arch/m68k/platform/68328/Makefile
545 Auto-merging arch/m68k/platform/68000/timers.c
546 Auto-merging arch/m68k/platform/68000/romvec.S
547 Auto-merging arch/m68k/platform/68000/m68VZ328.c
548 Auto-merging arch/m68k/platform/68000/m68EZ328.c
549 Auto-merging arch/m68k/platform/68000/m68328.c
550 Auto-merging arch/m68k/platform/68000/ints.c
551 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/termbits.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/termbits.h left in tree.
552 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sockios.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sockios.h left in tree.
553 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/socket.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/socket.h left in tree.
554 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/shmbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/shmbuf.h left in tree.
555 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sembuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/sembuf.h left in tree.
556 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/msgbuf.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/msgbuf.h left in tree.
557 CONFLICT (rename/delete): arch/m68k/include/uapi/asm/auxvec.h deleted in m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uapi/asm/auxvec.h left in tree.
558 CONFLICT (modify/delete): arch/m68k/include/asm/termios.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/termios.h left in tree.
559 Removing arch/m68k/include/asm/spinlock.h
560 Removing arch/m68k/include/asm/shmparam.h
561 Removing arch/m68k/include/asm/hw_irq.h
562 Auto-merging arch/m68k/include/asm/Kbuild
563 Automatic merge failed; fix conflicts and then commit the result.
564 $ git rm -f arch/m68k/include/asm/termios.h arch/m68k/include/uapi/asm/auxvec.h arch/m68k/include/uapi/asm/msgbuf.h arch/m68k/include/uapi/asm/sembuf.h arch/m68k/include/uapi/asm/shmbuf.h arch/m68k/include/uapi/asm/socket.h arch/m68k/include/uapi/asm/sockios.h arch/m68k/include/uapi/asm/termbits.h
565 arch/m68k/include/asm/termios.h: needs merge
566 arch/m68k/include/uapi/asm/auxvec.h: needs merge
567 arch/m68k/include/uapi/asm/msgbuf.h: needs merge
568 arch/m68k/include/uapi/asm/sembuf.h: needs merge
569 arch/m68k/include/uapi/asm/shmbuf.h: needs merge
570 arch/m68k/include/uapi/asm/socket.h: needs merge
571 arch/m68k/include/uapi/asm/sockios.h: needs merge
572 arch/m68k/include/uapi/asm/termbits.h: needs merge
573 rm 'arch/m68k/include/asm/termios.h'
574 rm 'arch/m68k/include/uapi/asm/auxvec.h'
575 rm 'arch/m68k/include/uapi/asm/msgbuf.h'
576 rm 'arch/m68k/include/uapi/asm/sembuf.h'
577 rm 'arch/m68k/include/uapi/asm/shmbuf.h'
578 rm 'arch/m68k/include/uapi/asm/socket.h'
579 rm 'arch/m68k/include/uapi/asm/sockios.h'
580 rm 'arch/m68k/include/uapi/asm/termbits.h'
582 [master cfd23b0] Merge remote-tracking branch 'm68knommu/for-next'
583 $ git diff -M --stat --summary HEAD^..
584 arch/m68k/Kconfig.cpu | 3 +-
585 arch/m68k/Makefile | 6 +-
586 arch/m68k/include/asm/Kbuild | 11 +
587 arch/m68k/include/asm/hw_irq.h | 6 -
588 arch/m68k/include/asm/shmparam.h | 6 -
589 arch/m68k/include/asm/spinlock.h | 6 -
590 arch/m68k/include/asm/termios.h | 50 ----
591 arch/m68k/include/uapi/asm/auxvec.h | 4 -
592 arch/m68k/include/uapi/asm/msgbuf.h | 31 ---
593 arch/m68k/include/uapi/asm/sembuf.h | 25 --
594 arch/m68k/include/uapi/asm/shmbuf.h | 42 ----
595 arch/m68k/include/uapi/asm/socket.h | 72 ------
596 arch/m68k/include/uapi/asm/sockios.h | 13 --
597 arch/m68k/include/uapi/asm/termbits.h | 201 ----------------
598 arch/m68k/platform/68000/Makefile | 18 ++
599 .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} | 0
600 arch/m68k/platform/{68328 => 68000}/bootlogo.h | 0
601 arch/m68k/platform/{68328 => 68000}/entry.S | 0
602 arch/m68k/platform/68000/head.S | 240 ++++++++++++++++++++
603 arch/m68k/platform/{68328 => 68000}/ints.c | 2 +-
604 .../platform/{68328/config.c => 68000/m68328.c} | 2 +-
605 .../{68EZ328/config.c => 68000/m68EZ328.c} | 2 +-
606 .../{68VZ328/config.c => 68000/m68VZ328.c} | 4 +-
607 arch/m68k/platform/{68328 => 68000}/romvec.S | 2 +-
608 arch/m68k/platform/{68328 => 68000}/timers.c | 2 +-
609 arch/m68k/platform/68328/Makefile | 21 --
610 arch/m68k/platform/68328/head-de2.S | 128 -----------
611 arch/m68k/platform/68328/head-pilot.S | 207 -----------------
612 arch/m68k/platform/68328/head-ram.S | 141 ------------
613 arch/m68k/platform/68328/head-rom.S | 105 ---------
614 arch/m68k/platform/68EZ328/Makefile | 5 -
615 arch/m68k/platform/68VZ328/Makefile | 5 -
616 32 files changed, 280 insertions(+), 1080 deletions(-)
617 delete mode 100644 arch/m68k/include/asm/hw_irq.h
618 delete mode 100644 arch/m68k/include/asm/shmparam.h
619 delete mode 100644 arch/m68k/include/asm/spinlock.h
620 delete mode 100644 arch/m68k/include/asm/termios.h
621 delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
622 delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
623 delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
624 delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
625 delete mode 100644 arch/m68k/include/uapi/asm/socket.h
626 delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
627 delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
628 create mode 100644 arch/m68k/platform/68000/Makefile
629 rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%)
630 rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%)
631 rename arch/m68k/platform/{68328 => 68000}/entry.S (100%)
632 create mode 100644 arch/m68k/platform/68000/head.S
633 rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
634 rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%)
635 rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%)
636 rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%)
637 rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%)
638 rename arch/m68k/platform/{68328 => 68000}/timers.c (98%)
639 delete mode 100644 arch/m68k/platform/68328/Makefile
640 delete mode 100644 arch/m68k/platform/68328/head-de2.S
641 delete mode 100644 arch/m68k/platform/68328/head-pilot.S
642 delete mode 100644 arch/m68k/platform/68328/head-ram.S
643 delete mode 100644 arch/m68k/platform/68328/head-rom.S
644 delete mode 100644 arch/m68k/platform/68EZ328/Makefile
645 delete mode 100644 arch/m68k/platform/68VZ328/Makefile
646 $ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch
647 Applying: m68k: fix up for UAPI changes
649 Unstaged changes after reset:
650 M arch/m68k/include/uapi/asm/Kbuild
652 $ git commit -v -a --amend
653 [master 3b05353] Merge remote-tracking branch 'm68knommu/for-next'
654 Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
655 $ git merge microblaze/next
656 Auto-merging arch/microblaze/include/asm/Kbuild
657 Merge made by the 'recursive' strategy.
658 arch/microblaze/include/asm/Kbuild | 2 -
659 arch/microblaze/include/asm/elf.h | 97 +----
660 arch/microblaze/include/asm/ptrace.h | 62 +--
661 arch/microblaze/include/asm/setup.h | 6 +-
662 arch/microblaze/include/asm/unistd.h | 390 +------------------
663 arch/microblaze/include/uapi/asm/Kbuild | 32 ++
664 arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
665 .../include/{ => uapi}/asm/bitsperlong.h | 0
666 arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
667 arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
668 arch/microblaze/include/{ => uapi}/asm/errno.h | 0
669 arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
670 arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
671 arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
672 arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
673 arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
674 arch/microblaze/include/{ => uapi}/asm/mman.h | 0
675 arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
676 arch/microblaze/include/{ => uapi}/asm/param.h | 0
677 arch/microblaze/include/{ => uapi}/asm/poll.h | 0
678 .../include/{ => uapi}/asm/posix_types.h | 0
679 arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
680 arch/microblaze/include/{ => uapi}/asm/resource.h | 0
681 arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
682 arch/microblaze/include/uapi/asm/setup.h | 19 +
683 arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
684 .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
685 arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
686 arch/microblaze/include/{ => uapi}/asm/signal.h | 0
687 arch/microblaze/include/{ => uapi}/asm/socket.h | 0
688 arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
689 arch/microblaze/include/{ => uapi}/asm/stat.h | 0
690 arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
691 arch/microblaze/include/{ => uapi}/asm/swab.h | 0
692 arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
693 arch/microblaze/include/{ => uapi}/asm/termios.h | 0
694 arch/microblaze/include/{ => uapi}/asm/types.h | 0
695 arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
696 38 files changed, 649 insertions(+), 552 deletions(-)
697 rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
698 rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
699 rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
700 create mode 100644 arch/microblaze/include/uapi/asm/elf.h
701 rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
702 rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
703 rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
704 rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
705 rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
706 rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
707 rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
708 rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
709 rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
710 rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
711 rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
712 create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
713 rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
714 rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
715 create mode 100644 arch/microblaze/include/uapi/asm/setup.h
716 rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
717 rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
718 rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
719 rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
720 rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
721 rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
722 rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
723 rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
724 rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
725 rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
726 rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
727 rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
728 create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
729 Merging mips/mips-for-linux-next (1996e38 MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set.)
730 $ git merge mips/mips-for-linux-next
731 Auto-merging MAINTAINERS
732 Merge made by the 'recursive' strategy.
734 arch/mips/Kconfig | 17 ++-
735 arch/mips/cavium-octeon/octeon-memcpy.S | 27 -----
736 arch/mips/cavium-octeon/setup.c | 40 +++++--
737 arch/mips/configs/cavium_octeon_defconfig | 98 ++++++++++++++---
738 arch/mips/include/asm/cpu.h | 6 +-
739 arch/mips/include/asm/mipsregs.h | 2 +-
740 arch/mips/include/asm/page.h | 8 +-
741 arch/mips/include/asm/pgtable-64.h | 2 +-
742 arch/mips/include/asm/pgtable-bits.h | 13 ++-
743 arch/mips/include/asm/pgtable.h | 168 ++++++++++++++++++++++++++++-
744 arch/mips/include/asm/sparsemem.h | 2 +-
745 arch/mips/include/asm/tlbdebug.h | 1 +
746 arch/mips/kernel/mips_ksyms.c | 2 +-
747 arch/mips/kernel/scall64-n32.S | 6 --
748 arch/mips/lib/dump_tlb.c | 47 ++++++++
749 arch/mips/mm/c-octeon.c | 46 ++++----
750 arch/mips/mm/pgtable-64.c | 31 ++++++
751 arch/mips/mm/tlb-r4k.c | 22 +++-
752 arch/mips/mm/tlbex.c | 91 +++++++++++-----
753 arch/mips/pci/pci-octeon.c | 4 +
754 drivers/edac/Kconfig | 33 +++++-
755 drivers/edac/Makefile | 5 +
756 drivers/edac/octeon_edac-l2c.c | 118 ++++++++++++++++++++
757 drivers/edac/octeon_edac-lmc.c | 150 ++++++++++++++++++++++++++
758 drivers/edac/octeon_edac-lmc.h | 78 ++++++++++++++
759 drivers/edac/octeon_edac-pc.c | 140 ++++++++++++++++++++++++
760 drivers/edac/octeon_edac-pci.c | 135 +++++++++++++++++++++++
761 28 files changed, 1172 insertions(+), 129 deletions(-)
762 create mode 100644 drivers/edac/octeon_edac-l2c.c
763 create mode 100644 drivers/edac/octeon_edac-lmc.c
764 create mode 100644 drivers/edac/octeon_edac-lmc.h
765 create mode 100644 drivers/edac/octeon_edac-pc.c
766 create mode 100644 drivers/edac/octeon_edac-pci.c
767 Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
768 $ git merge openrisc/for-upstream
769 Removing arch/openrisc/include/uapi/asm/kvm_para.h
770 Merge made by the 'recursive' strategy.
771 arch/openrisc/include/asm/Kbuild | 1 +
772 arch/openrisc/include/uapi/asm/kvm_para.h | 1 -
773 arch/openrisc/kernel/asm-offsets.c | 6 +-----
774 3 files changed, 2 insertions(+), 6 deletions(-)
775 delete mode 100644 arch/openrisc/include/uapi/asm/kvm_para.h
776 Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
777 $ git merge parisc/for-next
779 Merge made by the 'recursive' strategy.
780 Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
781 $ git merge powerpc/next
783 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
786 Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
787 $ git merge mpc5xxx/next
788 Merge made by the 'recursive' strategy.
789 arch/powerpc/boot/dts/mpc5200b.dtsi | 6 ++++++
790 arch/powerpc/boot/dts/o2d.dtsi | 6 ------
791 arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
792 arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +++++----
793 4 files changed, 17 insertions(+), 11 deletions(-)
794 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
795 $ git merge galak/next
797 Merging s390/features (0adeba2 s390/traps: preinitialize program check table)
798 $ git merge s390/features
799 Merge made by the 'recursive' strategy.
800 arch/s390/include/asm/pgtable.h | 10 +++
801 arch/s390/kernel/Makefile | 2 +-
802 arch/s390/kernel/entry.h | 21 +++++-
803 arch/s390/kernel/entry64.S | 4 +-
804 arch/s390/kernel/pgm_check.S | 152 +++++++++++++++++++++++++++++++++++++++
805 arch/s390/kernel/traps.c | 52 ++------------
806 arch/s390/mm/dump_pagetables.c | 7 +-
807 arch/s390/mm/pageattr.c | 2 +-
808 arch/s390/mm/vmem.c | 46 ++++++++++--
809 9 files changed, 240 insertions(+), 56 deletions(-)
810 create mode 100644 arch/s390/kernel/pgm_check.S
811 Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
812 $ git merge sh/sh-latest
814 Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
815 $ git merge sparc-next/master
817 Merging tile/master (ddffeb8 Linux 3.7-rc1)
818 $ git merge tile/master
820 Merging unicore32/unicore32 (5d05622 unicore32: switch to generic sys_execve())
821 $ git merge unicore32/unicore32
822 Auto-merging arch/unicore32/include/uapi/asm/unistd.h
823 Removing arch/unicore32/include/asm/kvm_para.h
824 Merge made by the 'recursive' strategy.
825 arch/unicore32/Kconfig | 5 ++
826 arch/unicore32/include/asm/Kbuild | 1 -
827 arch/unicore32/include/asm/bug.h | 5 --
828 arch/unicore32/include/asm/cmpxchg.h | 2 +-
829 arch/unicore32/include/asm/kvm_para.h | 1 -
830 arch/unicore32/include/asm/processor.h | 5 --
831 arch/unicore32/include/asm/ptrace.h | 76 +----------------
832 arch/unicore32/include/uapi/asm/Kbuild | 7 ++
833 arch/unicore32/include/{ => uapi}/asm/byteorder.h | 0
834 arch/unicore32/include/uapi/asm/ptrace.h | 90 ++++++++++++++++++++
835 arch/unicore32/include/{ => uapi}/asm/sigcontext.h | 0
836 arch/unicore32/include/{ => uapi}/asm/unistd.h | 1 +
837 arch/unicore32/kernel/entry.S | 20 ++---
838 arch/unicore32/kernel/process.c | 58 +++----------
839 arch/unicore32/kernel/setup.h | 6 ++
840 arch/unicore32/kernel/sys.c | 63 --------------
841 arch/unicore32/mm/fault.c | 37 +++++---
842 17 files changed, 159 insertions(+), 218 deletions(-)
843 delete mode 100644 arch/unicore32/include/asm/kvm_para.h
844 rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
845 create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
846 rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
847 rename arch/unicore32/include/{ => uapi}/asm/unistd.h (92%)
848 Merging xtensa/for_next (dc241f2 xtensa: switch to generic sys_execve())
849 $ git merge xtensa/for_next
850 Merge made by the 'recursive' strategy.
851 arch/xtensa/Kconfig | 2 +
852 arch/xtensa/include/asm/io.h | 4 ++
853 arch/xtensa/include/asm/processor.h | 4 +-
854 arch/xtensa/include/asm/syscall.h | 2 +-
855 arch/xtensa/include/asm/unistd.h | 15 ++--
856 arch/xtensa/include/uapi/asm/unistd.h | 16 ++---
857 arch/xtensa/kernel/entry.S | 57 ++++-----------
858 arch/xtensa/kernel/process.c | 128 ++++++++++++++++++---------------
859 arch/xtensa/kernel/syscall.c | 7 +-
860 arch/xtensa/kernel/xtensa_ksyms.c | 1 -
861 10 files changed, 104 insertions(+), 132 deletions(-)
862 Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref)
863 $ git merge btrfs/next
865 Merging ceph/master (3515297 rbd: activate v2 image support)
866 $ git merge ceph/master
867 Merge made by the 'recursive' strategy.
868 drivers/block/rbd.c | 100 +++++++++++++++++++++++++++++++++++++++-----------
869 net/ceph/messenger.c | 61 ++++++++++++++----------------
870 2 files changed, 106 insertions(+), 55 deletions(-)
871 Merging cifs/for-next (f51de01 cifs: extra sanity checking for cifs.idmap keys)
872 $ git merge cifs/for-next
873 Merge made by the 'recursive' strategy.
874 fs/cifs/cifsacl.c | 749 +++++++++++++++------------------------------------
875 fs/cifs/cifsacl.h | 53 ++--
876 fs/cifs/cifsfs.c | 12 +-
877 fs/cifs/cifsproto.h | 1 -
878 fs/cifs/inode.c | 7 +-
879 fs/cifs/readdir.c | 10 +
880 6 files changed, 258 insertions(+), 574 deletions(-)
881 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
882 $ git merge configfs/linux-next
884 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
885 $ git merge ecryptfs/next
887 Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
888 $ git merge ext3/for_next
890 Merging ext4/dev (5de35e8 ext4: Avoid underflow in ext4_trim_fs())
893 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
894 $ git merge fuse/for-next
895 Auto-merging include/uapi/linux/fuse.h
896 Auto-merging fs/fuse/inode.c
897 Auto-merging fs/fuse/dev.c
898 Merge made by the 'recursive' strategy.
900 fs/fuse/Kconfig | 16 ++++-
901 fs/fuse/dev.c | 19 ++++++
902 fs/fuse/dir.c | 160 +++++++++++++++++++++++++++++++++++++++++++--
903 fs/fuse/fuse_i.h | 6 ++
904 fs/fuse/inode.c | 5 +-
905 include/uapi/linux/fuse.h | 12 ++++
906 7 files changed, 211 insertions(+), 17 deletions(-)
907 Merging gfs2/master (a86888e GFS2: Rename glops go_xmote_th to go_sync)
908 $ git merge gfs2/master
909 Merge made by the 'recursive' strategy.
910 fs/gfs2/file.c | 2 --
911 fs/gfs2/glock.c | 14 ++++++-------
912 fs/gfs2/glock.h | 54 +++++++++++++++++++++++++-------------------------
913 fs/gfs2/glops.c | 16 +++++++--------
914 fs/gfs2/incore.h | 3 ++-
915 fs/gfs2/lops.c | 2 --
916 fs/gfs2/ops_fstype.c | 3 +++
917 fs/gfs2/quota.c | 7 +++++--
918 fs/gfs2/rgrp.c | 54 ++++++++++++++++++++++++++++++--------------------
919 9 files changed, 84 insertions(+), 71 deletions(-)
920 Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
921 $ git merge jfs/jfs-next
923 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
924 $ git merge logfs/master
925 Merge made by the 'recursive' strategy.
926 fs/logfs/dev_mtd.c | 2 +-
927 1 file changed, 1 insertion(+), 1 deletion(-)
928 Merging nfs/linux-next (481e438 NFSv4.1: Simplify the sequence setup)
929 $ git merge nfs/linux-next
930 Merge made by the 'recursive' strategy.
931 fs/lockd/clnt4xdr.c | 8 ---
932 fs/lockd/clntproc.c | 3 +-
933 fs/lockd/clntxdr.c | 8 ---
934 fs/lockd/host.c | 15 ++---
935 fs/lockd/mon.c | 60 +++++++++--------
936 fs/nfs/cache_lib.c | 1 -
937 fs/nfs/callback_proc.c | 1 -
938 fs/nfs/client.c | 6 +-
939 fs/nfs/inode.c | 4 +-
940 fs/nfs/mount_clnt.c | 7 +-
941 fs/nfs/nfs2xdr.c | 4 +-
942 fs/nfs/nfs3xdr.c | 7 +-
943 fs/nfs/nfs4_fs.h | 1 +
944 fs/nfs/nfs4client.c | 4 --
945 fs/nfs/nfs4file.c | 1 -
946 fs/nfs/nfs4filelayout.c | 37 +++--------
947 fs/nfs/nfs4filelayoutdev.c | 2 -
948 fs/nfs/nfs4proc.c | 150 ++++++++++++++----------------------------
949 fs/nfs/nfs4state.c | 1 -
950 fs/nfs/nfs4xdr.c | 6 +-
951 fs/nfs/objlayout/objlayout.c | 11 ----
952 fs/nfs/pnfs.c | 17 +----
953 fs/nfs/write.c | 26 +++-----
954 net/sunrpc/xprtsock.c | 41 +++---------
955 24 files changed, 136 insertions(+), 285 deletions(-)
956 Merging nfsd/nfsd-next (ddffeb8 Linux 3.7-rc1)
957 $ git merge nfsd/nfsd-next
959 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
960 $ git merge ocfs2/linux-next
961 Auto-merging fs/ocfs2/cluster/heartbeat.c
962 Merge made by the 'recursive' strategy.
963 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
964 fs/ocfs2/cluster/masklog.h | 3 ++-
965 fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
966 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
967 fs/ocfs2/symlink.c | 2 +-
968 5 files changed, 27 insertions(+), 35 deletions(-)
969 Merging omfs/for-next (976d167 Linux 3.1-rc9)
970 $ git merge omfs/for-next
972 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
973 $ git merge squashfs/master
975 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
976 $ git merge v9fs/for-next
977 Merge made by the 'recursive' strategy.
978 Merging ubifs/linux-next (a74b6e4 UBIFS: fix mounting problems after power cuts)
979 $ git merge ubifs/linux-next
980 Merge made by the 'recursive' strategy.
981 fs/ubifs/find.c | 5 +++--
982 fs/ubifs/lprops.c | 6 ++++++
983 fs/ubifs/ubifs.h | 3 +++
984 3 files changed, 12 insertions(+), 2 deletions(-)
985 Merging xfs/for-next (e04426b xfs: move allocation stack switch up to xfs_bmapi_allocate)
986 $ git merge xfs/for-next
987 Removing fs/xfs/xfs_iget.c
988 Auto-merging fs/xfs/xfs_icache.h
989 Auto-merging fs/xfs/xfs_icache.c
990 Merge made by the 'recursive' strategy.
991 fs/xfs/Makefile | 3 +-
992 fs/xfs/xfs_alloc.c | 43 +--
993 fs/xfs/xfs_alloc.h | 3 -
994 fs/xfs/xfs_bmap.c | 63 +++-
995 fs/xfs/xfs_bmap.h | 9 +-
996 fs/xfs/xfs_export.c | 1 +
997 fs/xfs/xfs_file.c | 13 +-
998 fs/xfs/xfs_ialloc.c | 1 +
999 fs/xfs/{xfs_sync.c => xfs_icache.c} | 701 ++++++++++++++++++++--------------
1000 fs/xfs/{xfs_sync.h => xfs_icache.h} | 14 +-
1001 fs/xfs/xfs_iget.c | 705 -----------------------------------
1002 fs/xfs/xfs_inode.c | 251 +++++++++++++
1003 fs/xfs/xfs_inode.h | 10 +-
1004 fs/xfs/xfs_iomap.c | 27 +-
1005 fs/xfs/xfs_itable.c | 1 +
1006 fs/xfs/xfs_log.c | 122 +++++-
1007 fs/xfs/xfs_log.h | 4 +
1008 fs/xfs/xfs_log_priv.h | 1 +
1009 fs/xfs/xfs_log_recover.c | 1 +
1010 fs/xfs/xfs_mount.c | 31 +-
1011 fs/xfs/xfs_mount.h | 6 +-
1012 fs/xfs/xfs_qm.c | 1 +
1013 fs/xfs/xfs_qm_syscalls.c | 1 +
1014 fs/xfs/xfs_rtalloc.c | 1 +
1015 fs/xfs/xfs_super.c | 139 ++++---
1016 fs/xfs/xfs_super.h | 1 +
1017 fs/xfs/xfs_vnodeops.c | 3 +-
1018 27 files changed, 987 insertions(+), 1169 deletions(-)
1019 rename fs/xfs/{xfs_sync.c => xfs_icache.c} (64%)
1020 rename fs/xfs/{xfs_sync.h => xfs_icache.h} (73%)
1021 delete mode 100644 fs/xfs/xfs_iget.c
1022 Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
1023 $ git merge vfs/for-next
1024 Auto-merging arch/alpha/kernel/osf_sys.c
1025 Merge made by the 'recursive' strategy.
1026 arch/alpha/kernel/osf_sys.c | 6 +++---
1027 1 file changed, 3 insertions(+), 3 deletions(-)
1028 Merging pci/next (6f0c058 Linux 3.7-rc2)
1029 $ git merge pci/next
1031 Merging hid/for-next (5277e97 HID: roccat: allow readout of koneplus sensor register data)
1032 $ git merge hid/for-next
1033 Merge made by the 'recursive' strategy.
1034 .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 6 +-
1035 .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 +
1036 drivers/hid/Makefile | 4 +-
1037 drivers/hid/hid-core.c | 1 +
1038 drivers/hid/hid-ids.h | 1 +
1039 drivers/hid/hid-roccat-koneplus.c | 11 +-
1040 drivers/hid/hid-roccat-lua.c | 227 ++++++++++++++++++++
1041 drivers/hid/hid-roccat-lua.h | 29 +++
1042 8 files changed, 280 insertions(+), 6 deletions(-)
1043 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
1044 create mode 100644 drivers/hid/hid-roccat-lua.c
1045 create mode 100644 drivers/hid/hid-roccat-lua.h
1046 Merging quilt/i2c (13a2e9c i2c-i801: Fix comment)
1047 $ git merge quilt/i2c
1048 Auto-merging drivers/i2c/i2c-stub.c
1049 Merge made by the 'recursive' strategy.
1050 drivers/i2c/Makefile | 1 +
1051 drivers/i2c/busses/Kconfig | 1 -
1052 drivers/i2c/busses/Makefile | 1 -
1053 drivers/i2c/busses/i2c-i801.c | 13 ++++---
1054 drivers/i2c/{busses => }/i2c-stub.c | 65 +++++++++++++++++------------------
1055 5 files changed, 42 insertions(+), 39 deletions(-)
1056 rename drivers/i2c/{busses => }/i2c-stub.c (75%)
1057 Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
1058 $ git merge i2c-embedded/i2c-embedded/for-next
1060 Merging quilt/jdelvare-hwmon (0110e1d hwmon: (w83627ehf) Add support for suspend)
1061 $ git merge quilt/jdelvare-hwmon
1062 Merge made by the 'recursive' strategy.
1063 drivers/hwmon/asb100.c | 2 +-
1064 drivers/hwmon/w83627ehf.c | 93 ++++++++++++++++++++++++++++++++++++++++++++-
1065 drivers/hwmon/w83627hf.c | 77 ++++++++++++++++++++++++++++++++++++-
1066 drivers/hwmon/w83781d.c | 2 +-
1067 drivers/hwmon/w83791d.c | 2 +-
1068 drivers/hwmon/w83792d.c | 2 +-
1069 drivers/hwmon/w83l786ng.c | 2 +-
1070 7 files changed, 172 insertions(+), 8 deletions(-)
1071 Merging hwmon-staging/hwmon-next (502d539 hwmon: DA9055 HWMON driver)
1072 $ git merge hwmon-staging/hwmon-next
1073 Merge made by the 'recursive' strategy.
1074 Documentation/hwmon/ads7828 | 46 +++--
1075 Documentation/hwmon/coretemp | 2 +
1076 Documentation/hwmon/da9055 | 47 +++++
1077 drivers/hwmon/Kconfig | 19 +-
1078 drivers/hwmon/Makefile | 1 +
1079 drivers/hwmon/ads7828.c | 247 ++++++++++--------------
1080 drivers/hwmon/coretemp.c | 60 +++---
1081 drivers/hwmon/da9052-hwmon.c | 27 +--
1082 drivers/hwmon/da9055-hwmon.c | 336 +++++++++++++++++++++++++++++++++
1083 drivers/hwmon/ina2xx.c | 13 +-
1084 include/linux/platform_data/ads7828.h | 29 +++
1085 11 files changed, 603 insertions(+), 224 deletions(-)
1086 create mode 100644 Documentation/hwmon/da9055
1087 create mode 100644 drivers/hwmon/da9055-hwmon.c
1088 create mode 100644 include/linux/platform_data/ads7828.h
1089 Merging v4l-dvb/master (c3a6417 Merge /home/v4l/v4l/for_upstream)
1090 $ git merge v4l-dvb/master
1092 Merge made by the 'recursive' strategy.
1093 Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
1094 $ git merge kbuild/for-next
1096 Merge made by the 'recursive' strategy.
1097 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
1098 $ git merge kconfig/for-next
1100 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
1101 $ git merge libata/NEXT
1103 Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
1104 $ git merge infiniband/for-next
1105 Merge made by the 'recursive' strategy.
1106 drivers/infiniband/hw/cxgb4/mem.c | 2 +-
1107 drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
1108 drivers/infiniband/hw/mlx4/mad.c | 85 +++++++++-----------
1109 drivers/infiniband/hw/mlx4/mcg.c | 18 +++--
1110 drivers/net/ethernet/mellanox/mlx4/eq.c | 6 --
1111 drivers/net/ethernet/mellanox/mlx4/main.c | 5 +-
1112 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 6 --
1113 7 files changed, 56 insertions(+), 68 deletions(-)
1114 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
1115 $ git merge pstore/master
1117 Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
1118 $ git merge acpi/next
1120 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
1121 $ git merge cpuidle/cpuidle-next
1122 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
1123 Resolved 'include/linux/cpuidle.h' using previous resolution.
1124 Auto-merging include/linux/cpuidle.h
1125 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
1126 Auto-merging drivers/cpuidle/coupled.c
1127 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
1128 Automatic merge failed; fix conflicts and then commit the result.
1130 [master 83be802] Merge remote-tracking branch 'cpuidle/cpuidle-next'
1131 $ git diff -M --stat --summary HEAD^..
1132 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
1133 $ git merge cpupowerutils/master
1135 Merging thermal/next (a180acf ACPI video: Ignore errors after _DOD evaluation.)
1136 $ git merge thermal/next
1137 Merge made by the 'recursive' strategy.
1138 Documentation/thermal/sysfs-api.txt | 64 ++
1139 drivers/acpi/thermal.c | 6 +-
1140 drivers/acpi/video.c | 11 +-
1141 drivers/platform/x86/acerhdf.c | 2 +-
1142 drivers/platform/x86/intel_mid_thermal.c | 2 +-
1143 drivers/power/power_supply_core.c | 2 +-
1144 drivers/staging/omap-thermal/omap-thermal-common.c | 2 +-
1145 drivers/thermal/Kconfig | 49 ++
1146 drivers/thermal/Makefile | 3 +
1147 drivers/thermal/exynos_thermal.c | 4 +-
1148 drivers/thermal/fair_share.c | 133 ++++
1149 drivers/thermal/rcar_thermal.c | 2 +-
1150 drivers/thermal/spear_thermal.c | 2 +-
1151 drivers/thermal/step_wise.c | 194 ++++++
1152 drivers/thermal/thermal_core.h | 53 ++
1153 drivers/thermal/thermal_sys.c | 700 +++++++++++++-------
1154 drivers/thermal/user_space.c | 68 ++
1155 include/linux/thermal.h | 128 +++-
1156 18 files changed, 1132 insertions(+), 293 deletions(-)
1157 create mode 100644 drivers/thermal/fair_share.c
1158 create mode 100644 drivers/thermal/step_wise.c
1159 create mode 100644 drivers/thermal/thermal_core.h
1160 create mode 100644 drivers/thermal/user_space.c
1161 Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
1162 $ git merge ieee1394/for-next
1164 Merging ubi/linux-next (ddffeb8 Linux 3.7-rc1)
1165 $ git merge ubi/linux-next
1167 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
1168 $ git merge dlm/next
1170 Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
1171 $ git merge scsi/for-next
1173 Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
1174 $ git merge target-updates/for-next
1176 Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
1177 $ git merge target-merge/for-next-merge
1179 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
1180 $ git merge ibft/linux-next
1182 Merging isci/all (6734092 isci: add a couple __iomem annotations)
1183 $ git merge isci/all
1185 Merging slave-dma/next (1f1a2af dw_dmac: introduce to_dw_desc() macro)
1186 $ git merge slave-dma/next
1187 Auto-merging drivers/dma/dw_dmac_regs.h
1188 Auto-merging drivers/dma/Kconfig
1189 Merge made by the 'recursive' strategy.
1190 Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++++++
1191 arch/arm/boot/dts/spear1340.dtsi | 19 +++
1192 arch/arm/boot/dts/spear13xx.dtsi | 38 +++++
1193 arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
1194 arch/arm/mach-spear13xx/spear1310.c | 4 +-
1195 arch/arm/mach-spear13xx/spear1340.c | 27 +---
1196 arch/arm/mach-spear13xx/spear13xx.c | 54 +------
1197 drivers/dma/Kconfig | 3 +-
1198 drivers/dma/dw_dmac.c | 167 +++++++++++++++++---
1199 drivers/dma/dw_dmac_regs.h | 6 +
1200 drivers/dma/pch_dma.c | 13 +-
1201 include/linux/dw_dmac.h | 45 ++++--
1202 12 files changed, 293 insertions(+), 129 deletions(-)
1203 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
1204 $ git merge dmaengine/next
1206 Merging net-next/master (e4e541a sock-diag: Report shutdown for inet and unix sockets (v2))
1207 $ git merge net-next/master
1208 Auto-merging net/ipv6/route.c
1209 Auto-merging net/ipv4/tcp_ipv4.c
1210 Auto-merging net/ipv4/tcp_input.c
1211 Auto-merging net/ipv4/tcp.c
1212 Auto-merging include/uapi/linux/usb/cdc.h
1213 Removing drivers/net/ethernet/cadence/at91_ether.h
1214 Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1215 Auto-merging MAINTAINERS
1216 Merge made by the 'recursive' strategy.
1218 arch/arm/mach-at91/Kconfig | 4 -
1219 arch/arm/mach-at91/board-csb337.c | 2 +
1220 arch/arm/mach-at91/include/mach/at91rm9200_emac.h | 138 ---
1221 arch/avr32/Kconfig | 1 -
1222 drivers/net/ethernet/cadence/Kconfig | 8 +-
1223 drivers/net/ethernet/cadence/at91_ether.c | 1029 +++--------------
1224 drivers/net/ethernet/cadence/at91_ether.h | 112 --
1225 drivers/net/ethernet/cadence/macb.c | 20 +-
1226 drivers/net/ethernet/cadence/macb.h | 22 +
1227 drivers/net/ethernet/emulex/benet/be.h | 20 +-
1228 drivers/net/ethernet/emulex/benet/be_cmds.c | 392 ++++++-
1229 drivers/net/ethernet/emulex/benet/be_cmds.h | 150 ++-
1230 drivers/net/ethernet/emulex/benet/be_ethtool.c | 80 +-
1231 drivers/net/ethernet/emulex/benet/be_hw.h | 3 +
1232 drivers/net/ethernet/emulex/benet/be_main.c | 535 ++++++---
1233 drivers/net/ethernet/intel/e1000e/netdev.c | 11 +
1234 drivers/net/ethernet/intel/igb/e1000_82575.h | 3 +
1235 drivers/net/ethernet/intel/igb/e1000_phy.c | 20 +
1236 drivers/net/ethernet/intel/igb/igb.h | 70 +-
1237 drivers/net/ethernet/intel/igb/igb_ethtool.c | 53 +-
1238 drivers/net/ethernet/intel/igb/igb_main.c | 1244 +++++++++++++--------
1239 drivers/net/ethernet/intel/igb/igb_ptp.c | 55 +-
1240 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +-
1241 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 44 +
1242 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 +-
1243 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 +
1244 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 102 +-
1245 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 +
1246 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 7 +-
1247 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 +-
1248 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 31 +-
1249 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 109 +-
1250 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 465 +++++---
1251 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
1252 drivers/net/ethernet/intel/ixgbevf/defines.h | 7 +-
1253 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
1254 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 210 +++-
1255 drivers/net/ethernet/intel/ixgbevf/mbx.h | 10 +
1256 drivers/net/ethernet/intel/ixgbevf/vf.c | 58 +
1257 drivers/net/ethernet/intel/ixgbevf/vf.h | 2 +
1258 drivers/net/hyperv/rndis_filter.c | 5 -
1259 drivers/net/usb/Kconfig | 18 +
1260 drivers/net/usb/Makefile | 1 +
1261 drivers/net/usb/cdc_mbim.c | 412 +++++++
1262 drivers/net/usb/cdc_ncm.c | 584 +++++-----
1263 include/linux/platform_data/macb.h | 1 +
1264 include/linux/usb/cdc_ncm.h | 134 +++
1265 include/net/af_unix.h | 1 -
1266 include/net/ip6_fib.h | 10 +
1267 include/uapi/linux/inet_diag.h | 3 +-
1268 include/uapi/linux/unix_diag.h | 1 +
1269 include/uapi/linux/usb/cdc.h | 23 +
1270 net/core/dev.c | 1 -
1271 net/core/pktgen.c | 6 +-
1272 net/core/rtnetlink.c | 6 +-
1273 net/core/sock.c | 3 +
1274 net/ipv4/fib_semantics.c | 2 +-
1275 net/ipv4/inet_diag.c | 3 +
1276 net/ipv4/tcp.c | 5 +-
1277 net/ipv4/tcp_input.c | 43 +-
1278 net/ipv4/tcp_ipv4.c | 7 +-
1279 net/ipv6/ip6_fib.c | 57 +
1280 net/ipv6/route.c | 136 ++-
1281 net/ipv6/tcp_ipv6.c | 4 +-
1282 net/sched/sch_api.c | 9 +-
1283 net/sched/sch_cbq.c | 3 +-
1284 net/unix/diag.c | 3 +
1285 68 files changed, 4102 insertions(+), 2497 deletions(-)
1286 delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1287 delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
1288 create mode 100644 drivers/net/usb/cdc_mbim.c
1289 create mode 100644 include/linux/usb/cdc_ncm.h
1290 Merging wireless-next/master (9b34f40 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
1291 $ git merge wireless-next/master
1292 Auto-merging drivers/net/wireless/mwifiex/scan.c
1293 Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
1294 Auto-merging drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
1295 Auto-merging drivers/net/wireless/b43/main.c
1296 Merge made by the 'recursive' strategy.
1297 arch/mips/bcm47xx/nvram.c | 4 +-
1298 arch/mips/bcm47xx/wgt634u.c | 8 +-
1299 drivers/bcma/driver_chipcommon.c | 23 +-
1300 drivers/bcma/driver_chipcommon_nflash.c | 3 +
1301 drivers/bcma/driver_chipcommon_pmu.c | 5 +-
1302 drivers/bcma/driver_chipcommon_sflash.c | 35 +-
1303 drivers/bcma/driver_mips.c | 48 +-
1304 drivers/bcma/driver_pci_host.c | 14 +-
1305 drivers/bcma/main.c | 54 +-
1306 drivers/bcma/sprom.c | 5 +-
1307 drivers/bluetooth/btmrvl_sdio.c | 28 +-
1308 drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +-
1309 drivers/net/wireless/airo.c | 2 +-
1310 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
1311 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
1312 drivers/net/wireless/ath/ath9k/ath9k.h | 2 +
1313 drivers/net/wireless/ath/ath9k/gpio.c | 60 +-
1314 drivers/net/wireless/ath/ath9k/hw.h | 1 +
1315 drivers/net/wireless/ath/ath9k/link.c | 12 +-
1316 drivers/net/wireless/ath/ath9k/main.c | 3 +-
1317 drivers/net/wireless/ath/carl9170/rx.c | 6 +-
1318 drivers/net/wireless/ath/carl9170/usb.c | 7 +
1319 drivers/net/wireless/ath/hw.c | 20 +-
1320 drivers/net/wireless/b43/main.c | 2 +-
1321 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 -
1322 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 +-
1323 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 36 -
1324 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 +-
1325 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +-
1326 drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
1327 drivers/net/wireless/hostap/hostap_80211_rx.c | 2 +-
1328 drivers/net/wireless/ipw2x00/libipw_rx.c | 6 +-
1329 drivers/net/wireless/iwlwifi/dvm/main.c | 9 +-
1330 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 95 +-
1331 drivers/net/wireless/iwlwifi/iwl-io.c | 4 +-
1332 drivers/net/wireless/iwlwifi/iwl-io.h | 2 +-
1333 drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
1334 drivers/net/wireless/iwlwifi/iwl-trans.h | 8 +
1335 drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +-
1336 drivers/net/wireless/iwlwifi/pcie/trans.c | 9 +-
1337 drivers/net/wireless/iwlwifi/pcie/tx.c | 18 +-
1338 drivers/net/wireless/libertas/mesh.c | 2 +-
1339 drivers/net/wireless/mwifiex/cfg80211.c | 4 +-
1340 drivers/net/wireless/mwifiex/cmdevt.c | 21 +-
1341 drivers/net/wireless/mwifiex/main.h | 2 -
1342 drivers/net/wireless/mwifiex/scan.c | 13 +-
1343 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
1344 drivers/net/wireless/orinoco/main.h | 2 +-
1345 drivers/net/wireless/orinoco/orinoco_usb.c | 9 +-
1346 drivers/net/wireless/rt2x00/rt2800lib.c | 100 +-
1347 drivers/net/wireless/rtlwifi/cam.c | 7 +-
1348 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 +-
1349 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 6 +-
1350 drivers/ssb/driver_mipscore.c | 16 +-
1351 include/linux/bcma/bcma.h | 2 +-
1352 include/linux/bcma/bcma_driver_chipcommon.h | 5 +
1353 include/linux/bcma/bcma_driver_mips.h | 3 +
1354 include/linux/bcma/bcma_regs.h | 5 +-
1355 include/linux/ieee80211.h | 47 +-
1356 include/linux/ssb/ssb_driver_mips.h | 10 +-
1357 include/net/bluetooth/a2mp.h | 24 +-
1358 include/net/bluetooth/amp.h | 50 +
1359 include/net/bluetooth/bluetooth.h | 1 -
1360 include/net/bluetooth/hci.h | 40 +-
1361 include/net/bluetooth/hci_core.h | 48 +-
1362 include/net/bluetooth/l2cap.h | 14 +-
1363 include/net/cfg80211.h | 14 +
1364 include/net/mac80211.h | 101 +-
1365 include/uapi/linux/nl80211.h | 48 +
1366 net/bluetooth/Kconfig | 1 +
1367 net/bluetooth/Makefile | 2 +-
1368 net/bluetooth/a2mp.c | 459 +++-
1369 net/bluetooth/af_bluetooth.c | 10 +-
1370 net/bluetooth/amp.c | 374 ++++
1371 net/bluetooth/bnep/core.c | 3 +-
1372 net/bluetooth/cmtp/core.c | 2 +-
1373 net/bluetooth/hci_conn.c | 70 +-
1374 net/bluetooth/hci_core.c | 65 +-
1375 net/bluetooth/hci_event.c | 167 +-
1376 net/bluetooth/hci_sysfs.c | 10 +-
1377 net/bluetooth/hidp/core.c | 8 +-
1378 net/bluetooth/l2cap_core.c | 503 +++--
1379 net/bluetooth/l2cap_sock.c | 89 +-
1380 net/bluetooth/lib.c | 14 -
1381 net/bluetooth/mgmt.c | 5 +-
1382 net/bluetooth/rfcomm/core.c | 19 +-
1383 net/bluetooth/rfcomm/sock.c | 9 +-
1384 net/bluetooth/rfcomm/tty.c | 6 +-
1385 net/bluetooth/sco.c | 12 +-
1386 net/bluetooth/smp.c | 2 +-
1387 net/mac80211/Kconfig | 2 +-
1388 net/mac80211/Makefile | 1 +
1389 net/mac80211/cfg.c | 284 +--
1390 net/mac80211/chan.c | 455 +++-
1391 net/mac80211/debugfs.h | 6 +-
1392 net/mac80211/debugfs_netdev.c | 10 +-
1393 net/mac80211/driver-ops.h | 65 +
1394 net/mac80211/ibss.c | 88 +-
1395 net/mac80211/ieee80211_i.h | 171 +-
1396 net/mac80211/iface.c | 44 +-
1397 net/mac80211/main.c | 105 +-
1398 net/mac80211/mesh.c | 43 +-
1399 net/mac80211/mesh.h | 4 +-
1400 net/mac80211/mesh_plink.c | 14 +-
1401 net/mac80211/mesh_sync.c | 55 +-
1402 net/mac80211/mlme.c | 219 +-
1403 net/mac80211/offchannel.c | 9 +-
1404 net/mac80211/pm.c | 2 +
1405 net/mac80211/rate.h | 12 +-
1406 net/mac80211/rx.c | 32 +-
1407 net/mac80211/scan.c | 29 +-
1408 net/mac80211/sta_info.c | 59 +-
1409 net/mac80211/status.c | 15 +-
1410 net/mac80211/trace.h | 112 +
1411 net/mac80211/tx.c | 281 ++-
1412 net/mac80211/util.c | 143 +-
1413 net/mac80211/vht.c | 35 +
1414 net/wireless/Makefile | 4 +-
1415 net/wireless/ap.c | 3 +-
1416 net/wireless/chan.c | 16 +-
1417 net/wireless/core.c | 12 +-
1418 net/wireless/core.h | 6 +-
1419 net/wireless/ethtool.c | 15 +-
1420 net/wireless/ibss.c | 9 +-
1421 net/wireless/mesh.c | 11 +-
1422 net/wireless/mlme.c | 92 +-
1423 net/wireless/nl80211.c | 255 ++-
1424 net/wireless/rdev-ops.h | 861 ++++++++
1425 net/wireless/scan.c | 138 +-
1426 net/wireless/sme.c | 12 +-
1427 net/wireless/sysfs.c | 5 +-
1428 net/wireless/trace.c | 7 +
1429 net/wireless/trace.h | 2286 ++++++++++++++++++++
1430 net/wireless/util.c | 14 +-
1431 net/wireless/wext-compat.c | 48 +-
1432 135 files changed, 7480 insertions(+), 1613 deletions(-)
1433 create mode 100644 include/net/bluetooth/amp.h
1434 create mode 100644 net/bluetooth/amp.c
1435 create mode 100644 net/mac80211/vht.c
1436 create mode 100644 net/wireless/rdev-ops.h
1437 create mode 100644 net/wireless/trace.c
1438 create mode 100644 net/wireless/trace.h
1439 Merging bluetooth/master (a11124c Bluetooth: Add put(hcon) when deleting hchan)
1440 $ git merge bluetooth/master
1441 Merge made by the 'recursive' strategy.
1442 include/net/bluetooth/hci.h | 7 +
1443 include/net/bluetooth/hci_core.h | 42 +-
1444 include/net/bluetooth/l2cap.h | 34 ++
1445 net/bluetooth/Kconfig | 1 -
1446 net/bluetooth/cmtp/capi.c | 2 +-
1447 net/bluetooth/cmtp/sock.c | 2 +-
1448 net/bluetooth/hci_conn.c | 6 +
1449 net/bluetooth/hci_core.c | 65 +--
1450 net/bluetooth/hci_event.c | 239 +++++++++-
1451 net/bluetooth/l2cap_core.c | 942 +++++++++++++++++++++++++++++++++++---
1452 net/bluetooth/l2cap_sock.c | 5 +
1453 net/bluetooth/mgmt.c | 88 ++--
1454 12 files changed, 1260 insertions(+), 173 deletions(-)
1455 Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
1456 $ git merge mtd/master
1457 Merge made by the 'recursive' strategy.
1458 drivers/mtd/nand/nand_base.c | 9 +++++----
1459 drivers/mtd/ofpart.c | 2 +-
1460 2 files changed, 6 insertions(+), 5 deletions(-)
1461 Merging l2-mtd/master (9dfb519 jffs2: Fix lock acquisition order bug in jffs2_write_begin)
1462 $ git merge l2-mtd/master
1463 Removing include/linux/platform_data/mtd-nomadik-nand.h
1464 Removing drivers/mtd/nand/nomadik_nand.c
1465 Removing arch/arm/mach-nomadik/include/mach/fsmc.h
1466 Auto-merging arch/arm/boot/dts/spear13xx.dtsi
1467 Merge made by the 'recursive' strategy.
1468 .../devicetree/bindings/mtd/denali-nand.txt | 23 ++
1469 .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +-
1470 Documentation/devicetree/bindings/mtd/m25p80.txt | 29 +++
1471 arch/arm/boot/dts/spear13xx.dtsi | 10 +-
1472 arch/arm/boot/dts/spear300.dtsi | 8 +-
1473 arch/arm/boot/dts/spear310.dtsi | 8 +-
1474 arch/arm/boot/dts/spear320.dtsi | 8 +-
1475 arch/arm/boot/dts/spear600.dtsi | 8 +-
1476 arch/arm/configs/nhk8815_defconfig | 2 +-
1477 arch/arm/mach-nomadik/board-nhk8815.c | 73 +++---
1478 arch/arm/mach-nomadik/include/mach/fsmc.h | 29 ---
1479 arch/arm/mach-u300/core.c | 14 +-
1480 drivers/clk/clk-nomadik.c | 1 +
1481 drivers/mtd/cmdlinepart.c | 80 +++----
1482 drivers/mtd/devices/m25p80.c | 36 +--
1483 drivers/mtd/devices/slram.c | 2 +-
1484 drivers/mtd/devices/spear_smi.c | 13 +-
1485 drivers/mtd/nand/Kconfig | 26 ++-
1486 drivers/mtd/nand/Makefile | 3 +-
1487 drivers/mtd/nand/denali.c | 162 +++-----------
1488 drivers/mtd/nand/denali.h | 5 +
1489 drivers/mtd/nand/denali_dt.c | 167 ++++++++++++++
1490 drivers/mtd/nand/denali_pci.c | 144 ++++++++++++
1491 drivers/mtd/nand/fsl_elbc_nand.c | 15 --
1492 drivers/mtd/nand/fsmc_nand.c | 102 ++++-----
1493 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +-
1494 drivers/mtd/nand/nomadik_nand.c | 235 --------------------
1495 drivers/mtd/onenand/onenand_base.c | 2 +-
1496 drivers/mtd/tests/mtd_nandbiterrs.c | 73 +++---
1497 drivers/mtd/tests/mtd_nandecctest.c | 6 +-
1498 drivers/mtd/tests/mtd_oobtest.c | 171 +++++++-------
1499 drivers/mtd/tests/mtd_pagetest.c | 152 ++++++-------
1500 drivers/mtd/tests/mtd_readtest.c | 42 ++--
1501 drivers/mtd/tests/mtd_speedtest.c | 88 ++++----
1502 drivers/mtd/tests/mtd_stresstest.c | 44 ++--
1503 drivers/mtd/tests/mtd_subpagetest.c | 124 +++++------
1504 drivers/mtd/tests/mtd_torturetest.c | 73 +++---
1505 fs/jffs2/file.c | 39 ++--
1506 include/linux/mtd/fsmc.h | 3 -
1507 include/linux/mtd/mtd.h | 2 +-
1508 include/linux/platform_data/mtd-nomadik-nand.h | 16 --
1509 41 files changed, 1023 insertions(+), 1041 deletions(-)
1510 create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
1511 create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
1512 delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
1513 create mode 100644 drivers/mtd/nand/denali_dt.c
1514 create mode 100644 drivers/mtd/nand/denali_pci.c
1515 delete mode 100644 drivers/mtd/nand/nomadik_nand.c
1516 delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
1517 Merging crypto/master (3200da8 crypto: tegra - fix missing unlock on error case)
1518 $ git merge crypto/master
1519 Auto-merging arch/x86/crypto/crc32c-intel_glue.c
1520 Merge made by the 'recursive' strategy.
1521 arch/x86/crypto/Makefile | 2 +
1522 arch/x86/crypto/camellia_glue.c | 16 +-
1523 arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 332 +-
1524 arch/x86/crypto/cast5_avx_glue.c | 79 +-
1525 arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 190 +-
1526 arch/x86/crypto/cast6_avx_glue.c | 77 +-
1527 .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} | 81 +
1528 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 ++
1529 arch/x86/crypto/glue_helper-asm-avx.S | 91 +
1530 arch/x86/crypto/glue_helper.c | 12 +-
1531 arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 166 +-
1532 arch/x86/crypto/serpent_avx_glue.c | 49 +-
1533 arch/x86/crypto/serpent_sse2_glue.c | 12 +-
1534 arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 208 +-
1535 arch/x86/crypto/twofish_avx_glue.c | 73 +-
1536 arch/x86/crypto/twofish_glue_3way.c | 20 +-
1537 arch/x86/include/asm/crypto/glue_helper.h | 28 +-
1538 arch/x86/include/asm/crypto/serpent-avx.h | 27 +-
1539 arch/x86/include/asm/crypto/twofish.h | 4 +-
1540 crypto/Kconfig | 10 +
1541 crypto/tcrypt.c | 6 +
1542 crypto/testmgr.c | 30 +
1543 crypto/testmgr.h | 5641 +++++++++++++++++++-
1544 crypto/vmac.c | 47 +-
1545 drivers/crypto/talitos.c | 3 +-
1546 drivers/crypto/tegra-aes.c | 8 +-
1547 include/crypto/vmac.h | 2 +
1548 27 files changed, 6956 insertions(+), 718 deletions(-)
1549 rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
1550 create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
1551 create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
1552 Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
1553 $ git merge drm/drm-next
1555 Merging sound/for-next (7dd7a2f ALSA: au88x0: Give comment for vortex_wtdma_bufshift() issue)
1556 $ git merge sound/for-next
1557 Auto-merging sound/pci/hda/patch_realtek.c
1558 Auto-merging sound/pci/hda/hda_intel.c
1559 Merge made by the 'recursive' strategy.
1560 include/sound/Kbuild | 10 -
1561 include/sound/asequencer.h | 594 +----------------
1562 include/sound/asound.h | 935 +-------------------------
1563 include/sound/emu10k1.h | 355 +---------
1564 include/sound/pcm.h | 3 +
1565 include/sound/sb16_csp.h | 104 +--
1566 include/uapi/sound/Kbuild | 10 +
1567 include/uapi/sound/asequencer.h | 614 +++++++++++++++++
1568 include/uapi/sound/asound.h | 960 +++++++++++++++++++++++++++
1569 include/{ => uapi}/sound/asound_fm.h | 0
1570 include/{ => uapi}/sound/compress_offload.h | 0
1571 include/{ => uapi}/sound/compress_params.h | 0
1572 include/uapi/sound/emu10k1.h | 373 +++++++++++
1573 include/{ => uapi}/sound/hdsp.h | 0
1574 include/{ => uapi}/sound/hdspm.h | 0
1575 include/uapi/sound/sb16_csp.h | 122 ++++
1576 include/{ => uapi}/sound/sfnt_info.h | 0
1577 sound/core/pcm_compat.c | 19 +-
1578 sound/core/pcm_lib.c | 57 +-
1579 sound/core/pcm_native.c | 2 +
1580 sound/drivers/Kconfig | 1 -
1581 sound/drivers/aloop.c | 36 +-
1582 sound/drivers/dummy.c | 73 +-
1583 sound/isa/Kconfig | 4 +-
1584 sound/pci/Kconfig | 2 +-
1585 sound/pci/au88x0/au88x0_core.c | 7 +-
1586 sound/pci/hda/Kconfig | 5 +-
1587 sound/pci/hda/hda_codec.c | 92 ++-
1588 sound/pci/hda/hda_codec.h | 3 +
1589 sound/pci/hda/hda_intel.c | 119 +++-
1590 sound/pci/hda/hda_jack.c | 24 +
1591 sound/pci/hda/hda_jack.h | 2 +
1592 sound/pci/hda/hda_local.h | 8 +-
1593 sound/pci/hda/patch_cirrus.c | 5 +-
1594 sound/pci/hda/patch_conexant.c | 44 ++
1595 sound/pci/hda/patch_hdmi.c | 7 +-
1596 sound/pci/hda/patch_realtek.c | 7 +-
1597 sound/pci/hda/patch_sigmatel.c | 7 +-
1598 sound/pci/ice1712/Makefile | 2 +-
1599 sound/pci/ice1712/amp.c | 1 -
1600 sound/pci/ice1712/aureon.c | 4 +-
1601 sound/pci/ice1712/delta.c | 1 -
1602 sound/pci/ice1712/ews.c | 5 +-
1603 sound/pci/ice1712/hoontech.c | 1 -
1604 sound/pci/ice1712/ice1712.c | 9 +-
1605 sound/pci/ice1712/ice1712.h | 12 +-
1606 sound/pci/ice1712/ice1724.c | 19 +-
1607 sound/pci/ice1712/juli.c | 4 +-
1608 sound/pci/ice1712/maya44.c | 5 +-
1609 sound/pci/ice1712/phase.c | 3 +-
1610 sound/pci/ice1712/pontis.c | 1 -
1611 sound/pci/ice1712/prodigy192.c | 5 +-
1612 sound/pci/ice1712/prodigy_hifi.c | 1 -
1613 sound/pci/ice1712/psc724.c | 464 +++++++++++++
1614 sound/pci/ice1712/psc724.h | 13 +
1615 sound/pci/ice1712/quartet.c | 10 +-
1616 sound/pci/ice1712/revo.c | 1 -
1617 sound/pci/ice1712/se.c | 11 +-
1618 sound/pci/ice1712/vt1720_mobo.c | 1 -
1619 sound/pci/ice1712/wm8766.c | 361 ++++++++++
1620 sound/pci/ice1712/wm8766.h | 163 +++++
1621 sound/pci/ice1712/wm8776.c | 633 ++++++++++++++++++
1622 sound/pci/ice1712/wm8776.h | 226 +++++++
1623 sound/pci/ice1712/wtm.c | 1 -
1624 sound/usb/Kconfig | 2 +-
1625 sound/usb/pcm.c | 3 -
1626 sound/usb/quirks-table.h | 75 +++
1627 67 files changed, 4519 insertions(+), 2122 deletions(-)
1628 create mode 100644 include/uapi/sound/asequencer.h
1629 create mode 100644 include/uapi/sound/asound.h
1630 rename include/{ => uapi}/sound/asound_fm.h (100%)
1631 rename include/{ => uapi}/sound/compress_offload.h (100%)
1632 rename include/{ => uapi}/sound/compress_params.h (100%)
1633 create mode 100644 include/uapi/sound/emu10k1.h
1634 rename include/{ => uapi}/sound/hdsp.h (100%)
1635 rename include/{ => uapi}/sound/hdspm.h (100%)
1636 create mode 100644 include/uapi/sound/sb16_csp.h
1637 rename include/{ => uapi}/sound/sfnt_info.h (100%)
1638 create mode 100644 sound/pci/ice1712/psc724.c
1639 create mode 100644 sound/pci/ice1712/psc724.h
1640 create mode 100644 sound/pci/ice1712/wm8766.c
1641 create mode 100644 sound/pci/ice1712/wm8766.h
1642 create mode 100644 sound/pci/ice1712/wm8776.c
1643 create mode 100644 sound/pci/ice1712/wm8776.h
1644 Merging sound-asoc/for-next (13123fd Merge remote-tracking branches 'asoc/fix/ux500', 'asoc/fix/wm8994', 'asoc/topic/ak4104', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/cs4271', 'asoc/topic/da9055', 'asoc/topic/davinci', 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/jack', 'asoc/topic/samsung', 'asoc/topic/si476x', 'asoc/topic/wm2200', 'asoc/topic/wm8750', 'asoc/topic/wm8770', 'asoc/topic/wm8971' and 'asoc/topic/wm8994' into asoc-next)
1645 $ git merge sound-asoc/for-next
1646 Merge made by the 'recursive' strategy.
1647 Documentation/devicetree/bindings/sound/ak4104.txt | 17 +
1648 Documentation/devicetree/bindings/sound/cs4271.txt | 2 +
1649 arch/arm/mach-at91/at91sam9260_devices.c | 9 +
1650 arch/arm/mach-at91/board-sam9g20ek.c | 17 +
1651 arch/arm/mach-davinci/board-da850-evm.c | 24 +-
1652 drivers/base/regmap/internal.h | 2 +
1653 drivers/base/regmap/regmap-debugfs.c | 50 +-
1654 drivers/base/regmap/regmap.c | 154 +++--
1655 drivers/misc/atmel-ssc.c | 65 +-
1656 include/linux/mfd/wm8994/pdata.h | 5 +
1657 include/linux/platform_data/davinci_asp.h | 3 +
1658 include/linux/regmap.h | 6 +-
1659 include/sound/cs4271.h | 1 +
1660 sound/soc/atmel/sam9g20_wm8731.c | 51 +-
1661 sound/soc/codecs/Kconfig | 4 +
1662 sound/soc/codecs/Makefile | 2 +
1663 sound/soc/codecs/ak4104.c | 29 +-
1664 sound/soc/codecs/cs4271.c | 21 +-
1665 sound/soc/codecs/da9055.c | 43 +-
1666 sound/soc/codecs/si476x.c | 255 ++++++++
1667 sound/soc/codecs/wm2200.c | 628 +++++++++++++++++++-
1668 sound/soc/codecs/wm5102.c | 4 +-
1669 sound/soc/codecs/wm8750.c | 86 ++-
1670 sound/soc/codecs/wm8770.c | 217 ++++---
1671 sound/soc/codecs/wm8958-dsp2.c | 31 +-
1672 sound/soc/codecs/wm8971.c | 80 ++-
1673 sound/soc/codecs/wm8994.c | 100 ++--
1674 sound/soc/codecs/wmfw.h | 99 +++
1675 sound/soc/davinci/davinci-evm.c | 5 +
1676 sound/soc/davinci/davinci-mcasp.c | 93 ++-
1677 sound/soc/davinci/davinci-mcasp.h | 2 +-
1678 sound/soc/davinci/davinci-pcm.c | 53 +-
1679 sound/soc/davinci/davinci-pcm.h | 2 +
1680 sound/soc/fsl/Kconfig | 16 +-
1681 sound/soc/fsl/Makefile | 4 +
1682 sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++
1683 sound/soc/fsl/pcm030-audio-fabric.c | 4 +-
1684 sound/soc/samsung/ac97.c | 6 +-
1685 sound/soc/samsung/bells.c | 222 +++++--
1686 sound/soc/samsung/i2s.c | 8 +-
1687 sound/soc/samsung/pcm.c | 12 +-
1688 sound/soc/samsung/spdif.c | 12 +-
1689 sound/soc/sh/fsi.c | 25 +-
1690 sound/soc/soc-jack.c | 3 -
1691 44 files changed, 2339 insertions(+), 525 deletions(-)
1692 create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
1693 create mode 100644 sound/soc/codecs/si476x.c
1694 create mode 100644 sound/soc/codecs/wmfw.h
1695 create mode 100644 sound/soc/fsl/p1022_rdk.c
1696 Merging modules/modules-next (29183bf Merge branch 'module-signing-fixes' into modules-next)
1697 $ git merge modules/modules-next
1698 Merge made by the 'recursive' strategy.
1699 Documentation/ABI/testing/ima_policy | 3 +-
1700 arch/arm/include/uapi/asm/unistd.h | 1 +
1701 arch/arm/kernel/calls.S | 1 +
1702 arch/powerpc/include/asm/systbl.h | 1 +
1703 arch/powerpc/include/asm/unistd.h | 2 +-
1704 arch/powerpc/include/uapi/asm/unistd.h | 1 +
1705 arch/x86/syscalls/syscall_32.tbl | 1 +
1706 arch/x86/syscalls/syscall_64.tbl | 1 +
1707 include/linux/asn1.h | 2 +
1708 include/linux/ima.h | 6 +
1709 include/linux/security.h | 13 ++
1710 include/linux/syscalls.h | 1 +
1711 include/uapi/asm-generic/unistd.h | 4 +-
1712 kernel/module.c | 375 +++++++++++++++++++-------------
1713 kernel/module_signing.c | 14 +-
1714 kernel/sys_ni.c | 1 +
1715 lib/asn1_decoder.c | 10 +-
1716 security/capability.c | 6 +
1717 security/integrity/ima/ima.h | 2 +-
1718 security/integrity/ima/ima_api.c | 4 +-
1719 security/integrity/ima/ima_main.c | 21 ++
1720 security/integrity/ima/ima_policy.c | 3 +
1721 security/security.c | 10 +
1722 23 files changed, 319 insertions(+), 164 deletions(-)
1723 Merging virtio/virtio-next (929ce32e virtio_console: Use kmalloc instead of kzalloc)
1724 $ git merge virtio/virtio-next
1725 Merge made by the 'recursive' strategy.
1726 drivers/char/virtio_console.c | 14 ++++---
1727 drivers/lguest/core.c | 2 +-
1728 drivers/net/virtio_net.c | 46 +++++++++------------
1729 drivers/rpmsg/virtio_rpmsg_bus.c | 6 +--
1730 drivers/scsi/virtio_scsi.c | 24 ++++++-----
1731 drivers/virtio/virtio_mmio.c | 4 +-
1732 drivers/virtio/virtio_pci.c | 20 ++-------
1733 drivers/virtio/virtio_ring.c | 46 +++++++++------------
1734 include/linux/virtio.h | 10 ++++-
1735 include/linux/virtio_scsi.h | 28 ++++++++++++-
1737 net/9p/trans_virtio.c | 3 +-
1738 tools/lguest/lguest.c | 84 ++++++++++++++++----------------------
1739 tools/virtio/virtio_test.c | 4 +-
1740 14 files changed, 141 insertions(+), 151 deletions(-)
1741 Merging input/next (a6e8c0a Input: qt2160 - fix qt2160_write() implementation)
1742 $ git merge input/next
1743 Auto-merging drivers/input/touchscreen/wm831x-ts.c
1744 Auto-merging drivers/input/touchscreen/edt-ft5x06.c
1745 Auto-merging drivers/input/keyboard/qt2160.c
1746 Auto-merging drivers/input/keyboard/Kconfig
1747 Merge made by the 'recursive' strategy.
1748 .../bindings/input/touchscreen/mms114.txt | 34 +++
1749 drivers/input/input-mt.c | 2 +-
1750 drivers/input/input.c | 5 +-
1751 drivers/input/joystick/as5011.c | 19 +-
1752 drivers/input/keyboard/Kconfig | 2 +-
1753 drivers/input/keyboard/qt2160.c | 19 +-
1754 drivers/input/misc/Kconfig | 7 +-
1755 drivers/input/misc/wm831x-on.c | 5 +-
1756 drivers/input/serio/Kconfig | 9 +
1757 drivers/input/serio/Makefile | 1 +
1758 drivers/input/serio/arc_ps2.c | 274 ++++++++++++++++++++
1759 drivers/input/serio/i8042-io.h | 2 +-
1760 drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +-
1761 drivers/input/touchscreen/edt-ft5x06.c | 10 +-
1762 drivers/input/touchscreen/mms114.c | 62 ++++-
1763 drivers/input/touchscreen/wm831x-ts.c | 6 +-
1764 16 files changed, 424 insertions(+), 46 deletions(-)
1765 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
1766 create mode 100644 drivers/input/serio/arc_ps2.c
1767 Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
1768 $ git merge input-mt/for-next
1770 Merging cgroup/for-next (5a9423c Merge branch 'for-3.8' into for-next)
1771 $ git merge cgroup/for-next
1772 Merge made by the 'recursive' strategy.
1773 include/linux/cgroup.h | 1 -
1774 include/linux/freezer.h | 50 +++++++++--
1775 kernel/cgroup.c | 62 +++++++-------
1776 kernel/cgroup_freezer.c | 210 +++++++++++++++++------------------------------
1777 kernel/fork.c | 9 +-
1778 5 files changed, 147 insertions(+), 185 deletions(-)
1779 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
1780 $ git merge block/for-next
1781 Resolved 'init/Kconfig' using previous resolution.
1782 Auto-merging init/Kconfig
1783 CONFLICT (content): Merge conflict in init/Kconfig
1784 Auto-merging drivers/block/mtip32xx/mtip32xx.h
1785 Auto-merging drivers/block/mtip32xx/mtip32xx.c
1786 Auto-merging drivers/block/loop.c
1787 Auto-merging drivers/block/floppy.c
1788 Auto-merging drivers/block/Kconfig
1789 Auto-merging block/genhd.c
1790 Auto-merging MAINTAINERS
1791 Automatic merge failed; fix conflicts and then commit the result.
1793 [master 2cdfa84] Merge remote-tracking branch 'block/for-next'
1794 $ git diff -M --stat --summary HEAD^..
1796 block/genhd.c | 6 +-
1797 drivers/block/Kconfig | 1 +
1798 drivers/block/cciss.c | 1 -
1799 drivers/block/floppy.c | 97 +-
1800 drivers/block/loop.c | 17 +-
1801 drivers/block/mtip32xx/mtip32xx.c | 19 +-
1802 drivers/block/mtip32xx/mtip32xx.h | 3 +
1803 drivers/block/xen-blkback/common.h | 4 +-
1804 drivers/block/xen-blkback/xenbus.c | 9 +-
1805 drivers/memstick/core/Kconfig | 12 +
1806 drivers/memstick/core/Makefile | 2 +-
1807 drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++
1808 drivers/memstick/core/ms_block.h | 293 +++++
1809 14 files changed, 2797 insertions(+), 69 deletions(-)
1810 create mode 100644 drivers/memstick/core/ms_block.c
1811 create mode 100644 drivers/memstick/core/ms_block.h
1812 Merging quilt/device-mapper (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
1813 $ git merge quilt/device-mapper
1814 Merge made by the 'recursive' strategy.
1815 drivers/md/dm-raid1.c | 10 ++---
1816 drivers/md/dm-snap.c | 5 +--
1817 drivers/md/persistent-data/dm-btree-internal.h | 16 ++++----
1818 drivers/md/persistent-data/dm-btree-remove.c | 50 ++++++++++++------------
1819 drivers/md/persistent-data/dm-btree-spine.c | 6 +--
1820 drivers/md/persistent-data/dm-btree.c | 22 +++++------
1821 6 files changed, 53 insertions(+), 56 deletions(-)
1822 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
1823 $ git merge embedded/master
1825 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
1826 $ git merge firmware/master
1828 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
1829 $ git merge pcmcia/master
1831 Merging mmc/mmc-next (e196442 mmc: dw_mmc: enable controller interrupt before calling mmc_start_host)
1832 $ git merge mmc/mmc-next
1833 Merge made by the 'recursive' strategy.
1834 drivers/mmc/card/queue.c | 17 +-
1835 drivers/mmc/host/Kconfig | 7 +
1836 drivers/mmc/host/Makefile | 1 +
1837 drivers/mmc/host/dw_mmc-pci.c | 2 +-
1838 drivers/mmc/host/dw_mmc-pltfm.c | 16 +-
1839 drivers/mmc/host/dw_mmc.c | 31 +-
1840 drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 +++++++++++++++++++++++++++++++++++++
1841 drivers/mmc/host/sdhci-of-esdhc.c | 11 +
1842 drivers/mmc/host/sdhci-pltfm.c | 7 +
1843 drivers/mmc/host/sdhci-s3c.c | 28 +-
1844 drivers/mmc/host/sdhci.c | 3 +
1845 drivers/mmc/host/sdhci.h | 1 +
1846 include/linux/mmc/dw_mmc.h | 2 +-
1847 include/linux/mmc/sdhci.h | 1 +
1848 14 files changed, 1408 insertions(+), 51 deletions(-)
1849 create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
1850 Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
1851 $ git merge kgdb/kgdb-next
1852 Merge made by the 'recursive' strategy.
1853 Merging slab/for-next (d75f461 Merge branch 'slab/next' into for-next)
1854 $ git merge slab/for-next
1855 Merge made by the 'recursive' strategy.
1856 include/linux/mm_types.h | 7 +--
1857 mm/slab.c | 118 +++++++++-------------------------------
1858 mm/slab.h | 20 +++++++
1859 mm/slab_common.c | 109 +++++++++++++++++++++++++++++++++++++
1860 mm/slub.c | 135 +++++++++++++---------------------------------
1861 5 files changed, 194 insertions(+), 195 deletions(-)
1862 Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
1863 $ git merge uclinux/for-next
1865 Merging md/for-next (8814c65 md/raid5: add blktrace calls)
1866 $ git merge md/for-next
1867 Merge made by the 'recursive' strategy.
1868 block/blk-core.c | 1 +
1869 drivers/md/faulty.c | 5 +-
1870 drivers/md/md.c | 8 +-
1871 drivers/md/md.h | 8 +
1872 drivers/md/raid5.c | 446 ++++++++++++++++++++++++++++++++--
1873 drivers/md/raid5.h | 19 ++
1874 include/linux/raid/Kbuild | 2 -
1875 include/linux/raid/md_u.h | 141 +----------
1876 include/uapi/linux/raid/Kbuild | 2 +
1877 include/{ => uapi}/linux/raid/md_p.h | 0
1878 include/uapi/linux/raid/md_u.h | 155 ++++++++++++
1879 11 files changed, 617 insertions(+), 170 deletions(-)
1880 rename include/{ => uapi}/linux/raid/md_p.h (100%)
1881 create mode 100644 include/uapi/linux/raid/md_u.h
1882 Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
1883 $ git merge mfd/for-next
1885 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
1886 $ git merge battery/master
1888 Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
1889 $ git merge fbdev/fbdev-next
1891 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
1892 $ git merge viafb/viafb-next
1894 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
1895 $ git merge omap_dss2/for-next
1897 Merging regulator/for-next (229d1a2 Merge remote-tracking branches 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
1898 $ git merge regulator/for-next
1899 Removing include/linux/regulator/tps65090-regulator.h
1900 Merge made by the 'recursive' strategy.
1901 .../bindings/regulator/gpio-regulator.txt | 36 +++
1902 .../devicetree/bindings/regulator/vexpress.txt | 32 ++
1903 drivers/regulator/Kconfig | 18 ++
1904 drivers/regulator/Makefile | 2 +
1905 drivers/regulator/core.c | 5 +
1906 drivers/regulator/gpio-regulator.c | 94 ++++++
1907 drivers/regulator/lp8788-ldo.c | 2 +-
1908 drivers/regulator/max77686.c | 164 +++++++++-
1909 drivers/regulator/tps51632-regulator.c | 332 ++++++++++++++++++++
1910 drivers/regulator/tps65090-regulator.c | 247 +++++++++++----
1911 drivers/regulator/vexpress.c | 147 +++++++++
1912 include/linux/mfd/tps65090.h | 35 +++
1913 include/linux/regulator/driver.h | 3 +
1914 include/linux/regulator/tps51632-regulator.h | 47 +++
1915 include/linux/regulator/tps65090-regulator.h | 50 ---
1916 15 files changed, 1091 insertions(+), 123 deletions(-)
1917 create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
1918 create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
1919 create mode 100644 drivers/regulator/tps51632-regulator.c
1920 create mode 100644 drivers/regulator/vexpress.c
1921 create mode 100644 include/linux/regulator/tps51632-regulator.h
1922 delete mode 100644 include/linux/regulator/tps65090-regulator.h
1923 Merging security/next (61d335d Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-queue)
1924 $ git merge security/next
1925 Resolved 'fs/cifs/cifsacl.c' using previous resolution.
1926 Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
1927 Resolved 'security/keys/keyctl.c' using previous resolution.
1928 Resolved 'security/keys/keyring.c' using previous resolution.
1929 Resolved 'security/keys/process_keys.c' using previous resolution.
1930 Auto-merging security/keys/request_key.c
1931 Auto-merging security/keys/process_keys.c
1932 CONFLICT (content): Merge conflict in security/keys/process_keys.c
1933 Auto-merging security/keys/keyring.c
1934 CONFLICT (content): Merge conflict in security/keys/keyring.c
1935 Auto-merging security/keys/keyctl.c
1936 CONFLICT (content): Merge conflict in security/keys/keyctl.c
1937 Auto-merging security/keys/key.c
1938 Auto-merging net/dns_resolver/dns_key.c
1939 CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
1940 Auto-merging kernel/cred.c
1941 Auto-merging include/linux/key.h
1942 Auto-merging fs/nfs/idmap.c
1943 Auto-merging fs/cifs/cifsacl.c
1944 CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
1945 Auto-merging arch/x86/kernel/vsyscall_64.c
1946 Auto-merging Documentation/security/keys.txt
1947 Automatic merge failed; fix conflicts and then commit the result.
1949 [master 7b1c0ee] Merge remote-tracking branch 'security/next'
1950 $ git diff -M --stat --summary HEAD^..
1951 Documentation/prctl/seccomp_filter.txt | 74 +++++++++++++++++--
1952 Documentation/security/keys.txt | 17 +++++
1953 arch/x86/kernel/vsyscall_64.c | 110 ++++++++++++++-------------
1954 fs/cifs/cifsacl.c | 12 +--
1955 fs/nfs/idmap.c | 12 +--
1956 include/linux/cred.h | 17 +----
1957 include/linux/key.h | 1 +
1958 kernel/cred.c | 127 ++++----------------------------
1959 kernel/seccomp.c | 13 +++-
1960 net/dns_resolver/dns_key.c | 9 +--
1961 security/keys/key.c | 6 +-
1962 security/keys/keyctl.c | 15 ++--
1963 security/keys/keyring.c | 10 +--
1964 security/keys/process_keys.c | 94 ++++++++++-------------
1965 security/keys/request_key.c | 21 ++++--
1966 15 files changed, 252 insertions(+), 286 deletions(-)
1967 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
1968 $ git merge selinux/master
1970 Merge made by the 'recursive' strategy.
1971 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
1972 $ git merge lblnet/master
1974 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
1975 $ git merge watchdog/master
1976 Merge made by the 'recursive' strategy.
1977 drivers/watchdog/davinci_wdt.c | 4 ++--
1978 1 file changed, 2 insertions(+), 2 deletions(-)
1979 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
1980 $ git merge dwmw2-iommu/master
1982 Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
1983 $ git merge iommu/next
1984 Merge made by the 'recursive' strategy.
1985 Documentation/DMA-API-HOWTO.txt | 126 ++++++++++++++++++++++++
1986 Documentation/DMA-API.txt | 12 +++
1987 arch/x86/include/asm/dma-mapping.h | 1 +
1988 drivers/iommu/amd_iommu.c | 184 +++++++++++++++++++++++++++---------
1989 drivers/iommu/amd_iommu_types.h | 1 +
1990 include/linux/dma-debug.h | 7 ++
1991 lib/dma-debug.c | 71 +++++++++++++-
1992 7 files changed, 355 insertions(+), 47 deletions(-)
1993 Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
1994 $ git merge vfio/next
1996 Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
1997 $ git merge osd/linux-next
1998 Merge made by the 'recursive' strategy.
1999 drivers/scsi/osd/osd_uld.c | 28 ++++++++++++++++++++++++++++
2000 1 file changed, 28 insertions(+)
2001 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
2002 $ git merge jc_docs/docs-next
2004 Merging trivial/for-next (46e99c4 tty: Fix typo in tty drivers)
2005 $ git merge trivial/for-next
2006 Auto-merging net/rfkill/core.c
2007 Auto-merging mm/util.c
2008 Auto-merging drivers/tty/serial/bfin_uart.c
2009 Auto-merging drivers/tty/serial/8250/Kconfig
2010 Auto-merging drivers/tty/hvc/hvc_vio.c
2011 Auto-merging drivers/target/iscsi/iscsi_target_parameters.c
2012 Auto-merging drivers/char/ppdev.c
2014 Merge made by the 'recursive' strategy.
2016 drivers/char/ppdev.c | 6 +-----
2017 drivers/net/wimax/i2400m/debugfs.c | 1 +
2018 drivers/target/iscsi/iscsi_target_parameters.c | 1 +
2019 drivers/tty/hvc/hvc_opal.c | 2 +-
2020 drivers/tty/hvc/hvc_vio.c | 2 +-
2021 drivers/tty/serial/8250/Kconfig | 2 +-
2022 drivers/tty/serial/bfin_uart.c | 2 +-
2023 drivers/tty/serial/icom.c | 2 +-
2025 net/rfkill/core.c | 4 ++--
2026 11 files changed, 15 insertions(+), 13 deletions(-)
2027 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
2028 $ git merge audit/for-next
2030 Merging pm/linux-next (4d8ab6e Merge branch 'fixes-next' into linux-next)
2031 $ git merge pm/linux-next
2032 Merge made by the 'recursive' strategy.
2033 Documentation/ABI/testing/sysfs-class-devfreq | 15 +-
2034 Documentation/ABI/testing/sysfs-devices-power | 31 ++
2035 Documentation/power/pm_qos_interface.txt | 2 +-
2036 arch/x86/kernel/acpi/sleep.c | 2 +
2037 arch/x86/pci/acpi.c | 10 +
2038 drivers/acpi/acpi_pad.c | 8 +-
2039 drivers/acpi/container.c | 17 +-
2040 drivers/acpi/dock.c | 26 +-
2041 drivers/acpi/ec.c | 97 ++---
2042 drivers/acpi/glue.c | 1 +
2043 drivers/acpi/internal.h | 4 +-
2044 drivers/acpi/osl.c | 7 +-
2045 drivers/acpi/processor_driver.c | 14 +
2046 drivers/acpi/scan.c | 11 +-
2047 drivers/acpi/sleep.c | 91 +++--
2048 drivers/base/core.c | 2 +-
2049 drivers/base/power/clock_ops.c | 6 +-
2050 drivers/base/power/domain.c | 16 +-
2051 drivers/base/power/opp.c | 55 ++-
2052 drivers/base/power/power.h | 6 +-
2053 drivers/base/power/qos.c | 292 +++++++++++---
2054 drivers/base/power/sysfs.c | 94 ++++-
2055 drivers/cpufreq/Makefile | 4 +-
2056 drivers/cpufreq/cpufreq.c | 16 +-
2057 drivers/cpufreq/cpufreq_conservative.c | 34 --
2058 drivers/cpufreq/cpufreq_governor.c | 52 +++
2059 drivers/cpufreq/cpufreq_ondemand.c | 34 --
2060 drivers/cpufreq/cpufreq_performance.c | 2 +
2061 drivers/cpufreq/cpufreq_powersave.c | 2 +
2062 drivers/cpufreq/cpufreq_stats.c | 1 +
2063 drivers/cpufreq/cpufreq_userspace.c | 2 +
2064 drivers/cpufreq/freq_table.c | 2 +
2065 drivers/cpufreq/powernow-k8.c | 9 +-
2066 drivers/cpuidle/cpuidle.c | 16 +-
2067 drivers/cpuidle/cpuidle.h | 6 +-
2068 drivers/cpuidle/governors/menu.c | 166 ++++++--
2069 drivers/cpuidle/sysfs.c | 19 +-
2070 drivers/devfreq/devfreq.c | 518 ++++++++++++-------------
2071 drivers/devfreq/governor.h | 13 +
2072 drivers/devfreq/governor_performance.c | 16 +-
2073 drivers/devfreq/governor_powersave.c | 16 +-
2074 drivers/devfreq/governor_simpleondemand.c | 33 ++
2075 drivers/devfreq/governor_userspace.c | 23 +-
2076 drivers/mtd/nand/sh_flctl.c | 4 +-
2077 drivers/pci/pci-acpi.c | 8 +-
2079 include/acpi/acpi_bus.h | 11 +-
2080 include/linux/acpi.h | 6 +-
2081 include/linux/cpufreq.h | 7 +
2082 include/linux/devfreq.h | 49 +--
2083 include/linux/pm.h | 3 +-
2084 include/linux/pm_qos.h | 77 +++-
2085 include/linux/tick.h | 6 +
2087 kernel/power/main.c | 2 +-
2088 kernel/power/qos.c | 65 +++-
2089 kernel/power/swap.c | 2 +-
2090 kernel/time/tick-sched.c | 4 +
2091 58 files changed, 1372 insertions(+), 674 deletions(-)
2092 create mode 100644 drivers/cpufreq/cpufreq_governor.c
2093 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
2094 $ git merge apm/for-next
2096 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
2097 $ git merge fsnotify/for-next
2098 Resolved 'kernel/audit_tree.c' using previous resolution.
2099 Auto-merging kernel/audit_watch.c
2100 Auto-merging kernel/audit_tree.c
2101 CONFLICT (content): Merge conflict in kernel/audit_tree.c
2102 Auto-merging include/linux/fsnotify_backend.h
2103 Auto-merging fs/notify/notification.c
2104 Auto-merging fs/notify/inotify/inotify_user.c
2105 Auto-merging fs/notify/fanotify/fanotify_user.c
2106 Automatic merge failed; fix conflicts and then commit the result.
2108 [master 1485c87] Merge remote-tracking branch 'fsnotify/for-next'
2109 $ git diff -M --stat --summary HEAD^..
2110 fs/notify/dnotify/dnotify.c | 4 +-
2111 fs/notify/fanotify/fanotify.c | 6 +++
2112 fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
2113 fs/notify/group.c | 47 ++++++++++--------
2114 fs/notify/inode_mark.c | 14 ++++--
2115 fs/notify/inotify/inotify_fsnotify.c | 4 +-
2116 fs/notify/inotify/inotify_user.c | 34 ++++++-------
2117 fs/notify/mark.c | 91 +++++++++++++++++++---------------
2118 fs/notify/notification.c | 1 +
2119 fs/notify/vfsmount_mark.c | 14 ++++--
2120 include/linux/fsnotify_backend.h | 31 ++++++++----
2121 kernel/audit_tree.c | 10 ++--
2122 kernel/audit_watch.c | 4 +-
2123 13 files changed, 178 insertions(+), 119 deletions(-)
2124 Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
2125 $ git merge edac/linux_next
2126 Auto-merging drivers/edac/edac_mc.c
2127 Merge made by the 'recursive' strategy.
2128 drivers/edac/edac_mc.c | 21 +-
2129 drivers/edac/i7300_edac.c | 8 +-
2130 drivers/edac/i82975x_edac.c | 457 +++++++++++++++++++++++++------------------
2131 drivers/edac/sb_edac.c | 2 +-
2132 include/linux/edac.h | 1 -
2133 5 files changed, 288 insertions(+), 201 deletions(-)
2134 Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
2135 $ git merge edac-amd/for-next
2136 Auto-merging include/linux/edac.h
2137 Auto-merging drivers/edac/edac_mc.c
2138 Auto-merging drivers/edac/Kconfig
2139 Merge made by the 'recursive' strategy.
2140 drivers/edac/Kconfig | 8 +-
2141 drivers/edac/amd64_edac.c | 297 +++++++++++++++------------------------
2142 drivers/edac/amd64_edac.h | 59 ++++++--
2143 drivers/edac/amd64_edac_inj.c | 128 +++++++++--------
2144 drivers/edac/edac_mc.c | 57 ++++----
2145 drivers/edac/edac_mc_sysfs.c | 39 +++--
2146 drivers/edac/edac_module.c | 27 +++-
2147 drivers/edac/edac_pci.c | 3 +-
2148 drivers/edac/highbank_mc_edac.c | 8 +-
2149 drivers/edac/mce_amd.c | 254 +++++++++++++++++----------------
2150 drivers/edac/mce_amd.h | 11 +-
2151 include/linux/edac.h | 3 +
2152 12 files changed, 456 insertions(+), 438 deletions(-)
2153 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
2154 $ git merge devicetree/devicetree/next
2156 Merging dt-rh/for-next (205a8eb dtc: fix for_each_*() to skip first object if deleted)
2157 $ git merge dt-rh/for-next
2159 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
2160 $ git merge spi/spi/next
2162 Merging spi-mb/spi-next (32111ab Merge tag 'spi-linus' into spi-next)
2163 $ git merge spi-mb/spi-next
2164 Auto-merging drivers/spi/spi-s3c64xx.c
2165 Merge made by the 'recursive' strategy.
2166 Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +-
2167 drivers/spi/spi-mxs.c | 3 +-
2168 drivers/spi/spi-omap2-mcspi.c | 25 +++++++---
2169 drivers/spi/spi-pl022.c | 52 ++++++++++++++------
2170 drivers/spi/spi-s3c64xx.c | 32 ++++++------
2171 include/linux/platform_data/spi-omap2-mcspi.h | 4 ++
2172 6 files changed, 79 insertions(+), 41 deletions(-)
2173 Merging tip/auto-latest (dc09199 Merge branch 'x86/urgent')
2174 $ git merge tip/auto-latest
2175 Auto-merging kernel/time/tick-sched.c
2176 Auto-merging include/linux/mm_types.h
2177 Auto-merging include/linux/acpi.h
2178 Auto-merging drivers/acpi/osl.c
2179 Auto-merging arch/s390/include/asm/pgtable.h
2180 Auto-merging arch/mips/include/asm/pgtable.h
2181 Auto-merging MAINTAINERS
2182 Merge made by the 'recursive' strategy.
2184 Documentation/acpi/initrd_table_override.txt | 94 ++
2185 Documentation/scheduler/numa-problem.txt | 230 +++
2187 arch/mips/include/asm/pgtable.h | 2 +
2188 arch/s390/include/asm/pgtable.h | 13 +
2189 arch/sh/mm/Kconfig | 1 +
2190 arch/x86/Kconfig | 31 +
2191 arch/x86/include/asm/efi.h | 5 +-
2192 arch/x86/include/asm/pgtable.h | 7 +
2193 arch/x86/kernel/Makefile | 1 -
2194 arch/x86/kernel/acpi/boot.c | 6 +
2195 arch/x86/kernel/apic/io_apic.c | 3 +
2196 arch/x86/kernel/cpu/perf_event.c | 131 +-
2197 arch/x86/kernel/cpu/perf_event.h | 5 +
2198 arch/x86/kernel/cpu/perf_event_amd.c | 9 +
2199 arch/x86/kernel/cpu/perf_event_intel.c | 9 +
2200 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 45 +-
2201 arch/x86/kernel/cpu/perf_event_knc.c | 93 +-
2202 arch/x86/kernel/cpu/perf_event_p6.c | 129 +-
2203 arch/x86/kernel/rtc.c | 6 -
2204 arch/x86/kernel/setup.c | 4 +
2205 arch/x86/kernel/tsc.c | 6 +
2206 arch/x86/lib/copy_page_64.S | 120 +-
2207 arch/x86/mm/gup.c | 23 +-
2208 arch/x86/mm/init.c | 22 +-
2209 arch/x86/mm/init_64.c | 7 +-
2210 arch/x86/mm/pgtable.c | 17 +-
2211 arch/x86/platform/efi/efi.c | 29 +-
2212 arch/x86/platform/efi/efi_64.c | 7 +-
2213 drivers/acpi/Kconfig | 9 +
2214 drivers/acpi/osl.c | 202 ++-
2215 drivers/base/node.c | 2 +-
2216 include/asm-generic/pgtable.h | 4 +
2217 include/linux/acpi.h | 16 +
2218 include/linux/earlycpio.h | 17 +
2219 include/linux/huge_mm.h | 19 +
2220 include/linux/init_task.h | 8 +
2221 include/linux/mempolicy.h | 11 +-
2222 include/linux/migrate.h | 7 +
2223 include/linux/migrate_mode.h | 3 +
2224 include/linux/mm.h | 122 +-
2225 include/linux/mm_types.h | 10 +
2226 include/linux/mmzone.h | 15 +-
2227 include/linux/page-flags-layout.h | 83 ++
2228 include/linux/perf_event.h | 10 +-
2229 include/linux/sched.h | 66 +-
2230 include/uapi/linux/mempolicy.h | 17 +-
2232 kernel/lockdep_proc.c | 2 +-
2233 kernel/sched/core.c | 88 +-
2234 kernel/sched/debug.c | 39 +-
2235 kernel/sched/fair.c | 1475 ++++++++++++++++---
2236 kernel/sched/features.h | 19 +
2237 kernel/sched/sched.h | 96 +-
2238 kernel/sysctl.c | 45 +-
2239 kernel/time/tick-sched.c | 113 +-
2241 lib/earlycpio.c | 145 ++
2242 mm/huge_memory.c | 254 +++-
2243 mm/memory.c | 132 +-
2244 mm/mempolicy.c | 273 +++-
2245 mm/migrate.c | 87 +-
2246 mm/mprotect.c | 31 +-
2247 mm/pgtable-generic.c | 3 +-
2249 scripts/kconfig/Makefile | 7 +-
2250 tools/kvm/.gitignore | 12 +
2251 tools/kvm/CREDITS-Git | 30 +
2252 tools/kvm/Documentation/kernel-debugging.txt | 15 +
2253 tools/kvm/Documentation/kvm-balloon.txt | 24 +
2254 tools/kvm/Documentation/kvm-debug.txt | 16 +
2255 tools/kvm/Documentation/kvm-list.txt | 16 +
2256 tools/kvm/Documentation/kvm-pause.txt | 16 +
2257 tools/kvm/Documentation/kvm-resume.txt | 16 +
2258 tools/kvm/Documentation/kvm-run.txt | 62 +
2259 tools/kvm/Documentation/kvm-sandbox.txt | 16 +
2260 tools/kvm/Documentation/kvm-setup.txt | 15 +
2261 tools/kvm/Documentation/kvm-stat.txt | 19 +
2262 tools/kvm/Documentation/kvm-stop.txt | 16 +
2263 tools/kvm/Documentation/kvm-version.txt | 21 +
2264 tools/kvm/Documentation/virtio-console.txt | 41 +
2265 tools/kvm/Makefile | 457 ++++++
2266 tools/kvm/README | 112 ++
2267 tools/kvm/builtin-balloon.c | 80 +
2268 tools/kvm/builtin-debug.c | 110 ++
2269 tools/kvm/builtin-help.c | 63 +
2270 tools/kvm/builtin-list.c | 149 ++
2271 tools/kvm/builtin-pause.c | 88 ++
2272 tools/kvm/builtin-resume.c | 88 ++
2273 tools/kvm/builtin-run.c | 697 +++++++++
2274 tools/kvm/builtin-sandbox.c | 9 +
2275 tools/kvm/builtin-setup.c | 262 ++++
2276 tools/kvm/builtin-stat.c | 127 ++
2277 tools/kvm/builtin-stop.c | 70 +
2278 tools/kvm/builtin-version.c | 15 +
2279 tools/kvm/code16gcc.h | 15 +
2280 tools/kvm/command-list.txt | 15 +
2281 tools/kvm/config/feature-tests.mak | 177 +++
2282 tools/kvm/config/utilities.mak | 196 +++
2283 tools/kvm/disk/blk.c | 76 +
2284 tools/kvm/disk/core.c | 354 +++++
2285 tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++
2286 tools/kvm/disk/raw.c | 141 ++
2287 tools/kvm/framebuffer.c | 80 +
2288 tools/kvm/guest/init.c | 72 +
2289 tools/kvm/guest_compat.c | 99 ++
2290 tools/kvm/hw/i8042.c | 355 +++++
2291 tools/kvm/hw/pci-shmem.c | 405 ++++++
2292 tools/kvm/hw/rtc.c | 149 ++
2293 tools/kvm/hw/serial.c | 452 ++++++
2294 tools/kvm/hw/vesa.c | 89 ++
2295 tools/kvm/include/asm/hweight.h | 8 +
2296 tools/kvm/include/bios/memcpy.h | 9 +
2297 tools/kvm/include/kvm/8250-serial.h | 11 +
2298 tools/kvm/include/kvm/apic.h | 17 +
2299 tools/kvm/include/kvm/brlock.h | 41 +
2300 tools/kvm/include/kvm/builtin-balloon.h | 9 +
2301 tools/kvm/include/kvm/builtin-debug.h | 20 +
2302 tools/kvm/include/kvm/builtin-help.h | 6 +
2303 tools/kvm/include/kvm/builtin-list.h | 10 +
2304 tools/kvm/include/kvm/builtin-pause.h | 9 +
2305 tools/kvm/include/kvm/builtin-resume.h | 9 +
2306 tools/kvm/include/kvm/builtin-run.h | 11 +
2307 tools/kvm/include/kvm/builtin-sandbox.h | 6 +
2308 tools/kvm/include/kvm/builtin-setup.h | 11 +
2309 tools/kvm/include/kvm/builtin-stat.h | 9 +
2310 tools/kvm/include/kvm/builtin-stop.h | 9 +
2311 tools/kvm/include/kvm/builtin-version.h | 6 +
2312 tools/kvm/include/kvm/compiler.h | 10 +
2313 tools/kvm/include/kvm/disk-image.h | 96 ++
2314 tools/kvm/include/kvm/e820.h | 13 +
2315 tools/kvm/include/kvm/framebuffer.h | 36 +
2316 tools/kvm/include/kvm/guest_compat.h | 9 +
2317 tools/kvm/include/kvm/i8042.h | 12 +
2318 tools/kvm/include/kvm/ioeventfd.h | 28 +
2319 tools/kvm/include/kvm/ioport.h | 70 +
2320 tools/kvm/include/kvm/irq.h | 33 +
2321 tools/kvm/include/kvm/kvm-cmd.h | 17 +
2322 tools/kvm/include/kvm/kvm-config.h | 60 +
2323 tools/kvm/include/kvm/kvm-cpu.h | 26 +
2324 tools/kvm/include/kvm/kvm-ipc.h | 26 +
2325 tools/kvm/include/kvm/kvm.h | 121 ++
2326 tools/kvm/include/kvm/msi.h | 10 +
2327 tools/kvm/include/kvm/mutex.h | 33 +
2328 tools/kvm/include/kvm/parse-options.h | 218 +++
2329 tools/kvm/include/kvm/pci-shmem.h | 32 +
2330 tools/kvm/include/kvm/pci.h | 95 ++
2331 tools/kvm/include/kvm/qcow.h | 133 ++
2332 tools/kvm/include/kvm/rbtree-interval.h | 28 +
2333 tools/kvm/include/kvm/read-write.h | 43 +
2334 tools/kvm/include/kvm/rtc.h | 9 +
2335 tools/kvm/include/kvm/rwsem.h | 39 +
2336 tools/kvm/include/kvm/sdl.h | 28 +
2337 tools/kvm/include/kvm/segment.h | 21 +
2338 tools/kvm/include/kvm/strbuf.h | 20 +
2339 tools/kvm/include/kvm/symbol.h | 30 +
2340 tools/kvm/include/kvm/term.h | 24 +
2341 tools/kvm/include/kvm/threadpool.h | 38 +
2342 tools/kvm/include/kvm/types.h | 7 +
2343 tools/kvm/include/kvm/uip.h | 360 +++++
2344 tools/kvm/include/kvm/util-init.h | 51 +
2345 tools/kvm/include/kvm/util.h | 97 ++
2346 tools/kvm/include/kvm/vesa.h | 18 +
2347 tools/kvm/include/kvm/virtio-9p.h | 76 +
2348 tools/kvm/include/kvm/virtio-balloon.h | 9 +
2349 tools/kvm/include/kvm/virtio-blk.h | 12 +
2350 tools/kvm/include/kvm/virtio-console.h | 10 +
2351 tools/kvm/include/kvm/virtio-mmio.h | 58 +
2352 tools/kvm/include/kvm/virtio-net.h | 30 +
2353 tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
2354 tools/kvm/include/kvm/virtio-pci.h | 49 +
2355 tools/kvm/include/kvm/virtio-rng.h | 9 +
2356 tools/kvm/include/kvm/virtio-scsi.h | 26 +
2357 tools/kvm/include/kvm/virtio.h | 102 ++
2358 tools/kvm/include/kvm/vnc.h | 22 +
2359 tools/kvm/include/linux/bitops.h | 33 +
2360 tools/kvm/include/linux/byteorder.h | 7 +
2361 tools/kvm/include/linux/compiler.h | 20 +
2362 tools/kvm/include/linux/kernel.h | 41 +
2363 tools/kvm/include/linux/module.h | 6 +
2364 tools/kvm/include/linux/prefetch.h | 6 +
2365 tools/kvm/include/linux/stddef.h | 16 +
2366 tools/kvm/include/linux/types.h | 51 +
2367 tools/kvm/ioeventfd.c | 216 +++
2368 tools/kvm/ioport.c | 198 +++
2369 tools/kvm/kvm-cmd.c | 91 ++
2370 tools/kvm/kvm-cpu.c | 242 ++++
2371 tools/kvm/kvm-ipc.c | 498 +++++++
2372 tools/kvm/kvm.c | 458 ++++++
2373 tools/kvm/main.c | 19 +
2374 tools/kvm/mmio.c | 139 ++
2375 tools/kvm/net/uip/arp.c | 30 +
2376 tools/kvm/net/uip/buf.c | 114 ++
2377 tools/kvm/net/uip/core.c | 190 +++
2378 tools/kvm/net/uip/csum.c | 92 ++
2379 tools/kvm/net/uip/dhcp.c | 202 +++
2380 tools/kvm/net/uip/icmp.c | 29 +
2381 tools/kvm/net/uip/ipv4.c | 29 +
2382 tools/kvm/net/uip/tcp.c | 345 +++++
2383 tools/kvm/net/uip/udp.c | 236 +++
2384 tools/kvm/pci.c | 215 +++
2385 tools/kvm/powerpc/boot.c | 8 +
2386 tools/kvm/powerpc/cpu_info.c | 195 +++
2387 tools/kvm/powerpc/cpu_info.h | 42 +
2388 tools/kvm/powerpc/include/kvm/barrier.h | 6 +
2389 tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 +
2390 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
2391 tools/kvm/powerpc/ioport.c | 18 +
2392 tools/kvm/powerpc/irq.c | 56 +
2393 tools/kvm/powerpc/kvm-cpu.c | 290 ++++
2394 tools/kvm/powerpc/kvm.c | 529 +++++++
2395 tools/kvm/powerpc/spapr.h | 93 ++
2396 tools/kvm/powerpc/spapr_hcall.c | 134 ++
2397 tools/kvm/powerpc/spapr_hvcons.c | 108 ++
2398 tools/kvm/powerpc/spapr_hvcons.h | 19 +
2399 tools/kvm/powerpc/spapr_pci.c | 423 ++++++
2400 tools/kvm/powerpc/spapr_pci.h | 57 +
2401 tools/kvm/powerpc/spapr_rtas.c | 233 +++
2402 tools/kvm/powerpc/xics.c | 522 +++++++
2403 tools/kvm/powerpc/xics.h | 18 +
2404 tools/kvm/symbol.c | 133 ++
2405 tools/kvm/term.c | 171 +++
2406 tools/kvm/tests/Makefile | 19 +
2407 tools/kvm/tests/boot/Makefile | 13 +
2408 tools/kvm/tests/boot/init.c | 11 +
2409 tools/kvm/tests/kernel/.gitignore | 2 +
2410 tools/kvm/tests/kernel/Makefile | 20 +
2411 tools/kvm/tests/kernel/README | 16 +
2412 tools/kvm/tests/kernel/kernel.S | 8 +
2413 tools/kvm/tests/pit/.gitignore | 2 +
2414 tools/kvm/tests/pit/Makefile | 20 +
2415 tools/kvm/tests/pit/README | 16 +
2416 tools/kvm/tests/pit/tick.S | 101 ++
2417 tools/kvm/ui/sdl.c | 321 ++++
2418 tools/kvm/ui/vnc.c | 248 ++++
2419 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
2420 tools/kvm/util/generate-cmdlist.sh | 23 +
2421 tools/kvm/util/init.c | 69 +
2422 tools/kvm/util/kvm-ifup-vbr0 | 6 +
2423 tools/kvm/util/parse-options.c | 577 ++++++++
2424 tools/kvm/util/rbtree-interval.c | 118 ++
2425 tools/kvm/util/read-write.c | 354 +++++
2426 tools/kvm/util/set_private_br.sh | 51 +
2427 tools/kvm/util/strbuf.c | 62 +
2428 tools/kvm/util/threadpool.c | 173 +++
2429 tools/kvm/util/util.c | 133 ++
2430 tools/kvm/virtio/9p-pdu.c | 287 ++++
2431 tools/kvm/virtio/9p.c | 1432 ++++++++++++++++++
2432 tools/kvm/virtio/balloon.c | 270 ++++
2433 tools/kvm/virtio/blk.c | 315 ++++
2434 tools/kvm/virtio/console.c | 203 +++
2435 tools/kvm/virtio/core.c | 233 +++
2436 tools/kvm/virtio/mmio.c | 264 ++++
2437 tools/kvm/virtio/net.c | 670 +++++++++
2438 tools/kvm/virtio/pci.c | 398 +++++
2439 tools/kvm/virtio/rng.c | 193 +++
2440 tools/kvm/virtio/scsi.c | 309 ++++
2441 tools/kvm/x86/bios.c | 174 +++
2442 tools/kvm/x86/bios/.gitignore | 3 +
2443 tools/kvm/x86/bios/bios-rom.S | 12 +
2444 tools/kvm/x86/bios/e820.c | 72 +
2445 tools/kvm/x86/bios/entry.S | 92 ++
2446 tools/kvm/x86/bios/gen-offsets.sh | 14 +
2447 tools/kvm/x86/bios/int10.c | 110 ++
2448 tools/kvm/x86/bios/int15.c | 18 +
2449 tools/kvm/x86/bios/local.S | 7 +
2450 tools/kvm/x86/bios/macro.S | 25 +
2451 tools/kvm/x86/bios/memcpy.c | 23 +
2452 tools/kvm/x86/bios/rom.ld.S | 16 +
2453 tools/kvm/x86/boot.c | 41 +
2454 tools/kvm/x86/cpuid.c | 60 +
2455 tools/kvm/x86/include/kvm/assembly.h | 24 +
2456 tools/kvm/x86/include/kvm/barrier.h | 20 +
2457 tools/kvm/x86/include/kvm/bios-export.h | 13 +
2458 tools/kvm/x86/include/kvm/bios.h | 93 ++
2459 tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
2460 tools/kvm/x86/include/kvm/cpufeature.h | 41 +
2461 tools/kvm/x86/include/kvm/interrupt.h | 26 +
2462 tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
2463 tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
2464 tools/kvm/x86/include/kvm/mptable.h | 9 +
2465 tools/kvm/x86/interrupt.c | 28 +
2466 tools/kvm/x86/ioport.c | 77 +
2467 tools/kvm/x86/irq.c | 224 +++
2468 tools/kvm/x86/kvm-cpu.c | 425 ++++++
2469 tools/kvm/x86/kvm.c | 362 +++++
2470 tools/kvm/x86/mptable.c | 289 ++++
2471 tools/perf/Documentation/android.txt | 75 +
2472 tools/perf/Documentation/perf-diff.txt | 60 +
2473 tools/perf/Makefile | 33 +-
2474 tools/perf/builtin-annotate.c | 3 +-
2475 tools/perf/builtin-diff.c | 405 +++++-
2476 tools/perf/builtin-help.c | 2 +-
2477 tools/perf/builtin-inject.c | 6 +-
2478 tools/perf/builtin-kvm.c | 35 +-
2479 tools/perf/builtin-record.c | 32 +
2480 tools/perf/builtin-report.c | 4 +-
2481 tools/perf/builtin-sched.c | 3 +-
2482 tools/perf/builtin-script.c | 4 +-
2483 tools/perf/builtin-test.c | 2 -
2484 tools/perf/builtin-top.c | 3 +-
2485 tools/perf/builtin-trace.c | 71 +-
2486 tools/perf/config/feature-tests.mak | 20 +-
2487 tools/perf/perf.c | 2 +
2488 tools/perf/ui/hist.c | 134 +-
2489 tools/perf/ui/stdio/hist.c | 2 +-
2490 tools/perf/util/build-id.c | 2 +-
2491 tools/perf/util/event.c | 215 +--
2492 tools/perf/util/event.h | 6 +-
2493 tools/perf/util/evlist.c | 3 -
2494 tools/perf/util/hist.h | 8 +
2495 tools/perf/util/machine.c | 277 ++++
2496 tools/perf/util/machine.h | 19 +
2497 tools/perf/util/parse-events-test.c | 80 +-
2498 tools/perf/util/parse-events.c | 18 +
2499 tools/perf/util/parse-events.h | 2 +
2500 tools/perf/util/parse-events.y | 18 +
2501 tools/perf/util/pmu.c | 7 +-
2502 .../util/scripting-engines/trace-event-python.c | 1 -
2503 tools/perf/util/session.c | 4 +-
2504 tools/perf/util/sort.h | 18 +
2505 tools/perf/util/thread.c | 42 +-
2506 tools/perf/util/thread.h | 2 +
2507 tools/perf/util/trace-event-read.c | 2 -
2508 tools/perf/util/util.c | 2 +
2509 tools/perf/util/util.h | 2 +
2510 327 files changed, 30633 insertions(+), 1006 deletions(-)
2511 create mode 100644 Documentation/acpi/initrd_table_override.txt
2512 create mode 100644 Documentation/scheduler/numa-problem.txt
2513 create mode 100644 include/linux/earlycpio.h
2514 create mode 100644 include/linux/page-flags-layout.h
2515 create mode 100644 lib/earlycpio.c
2516 create mode 100644 tools/kvm/.gitignore
2517 create mode 100644 tools/kvm/CREDITS-Git
2518 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
2519 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
2520 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
2521 create mode 100644 tools/kvm/Documentation/kvm-list.txt
2522 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
2523 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
2524 create mode 100644 tools/kvm/Documentation/kvm-run.txt
2525 create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
2526 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
2527 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
2528 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
2529 create mode 100644 tools/kvm/Documentation/kvm-version.txt
2530 create mode 100644 tools/kvm/Documentation/virtio-console.txt
2531 create mode 100644 tools/kvm/Makefile
2532 create mode 100644 tools/kvm/README
2533 create mode 100644 tools/kvm/builtin-balloon.c
2534 create mode 100644 tools/kvm/builtin-debug.c
2535 create mode 100644 tools/kvm/builtin-help.c
2536 create mode 100644 tools/kvm/builtin-list.c
2537 create mode 100644 tools/kvm/builtin-pause.c
2538 create mode 100644 tools/kvm/builtin-resume.c
2539 create mode 100644 tools/kvm/builtin-run.c
2540 create mode 100644 tools/kvm/builtin-sandbox.c
2541 create mode 100644 tools/kvm/builtin-setup.c
2542 create mode 100644 tools/kvm/builtin-stat.c
2543 create mode 100644 tools/kvm/builtin-stop.c
2544 create mode 100644 tools/kvm/builtin-version.c
2545 create mode 100644 tools/kvm/code16gcc.h
2546 create mode 100644 tools/kvm/command-list.txt
2547 create mode 100644 tools/kvm/config/feature-tests.mak
2548 create mode 100644 tools/kvm/config/utilities.mak
2549 create mode 100644 tools/kvm/disk/blk.c
2550 create mode 100644 tools/kvm/disk/core.c
2551 create mode 100644 tools/kvm/disk/qcow.c
2552 create mode 100644 tools/kvm/disk/raw.c
2553 create mode 100644 tools/kvm/framebuffer.c
2554 create mode 100644 tools/kvm/guest/init.c
2555 create mode 100644 tools/kvm/guest_compat.c
2556 create mode 100644 tools/kvm/hw/i8042.c
2557 create mode 100644 tools/kvm/hw/pci-shmem.c
2558 create mode 100644 tools/kvm/hw/rtc.c
2559 create mode 100644 tools/kvm/hw/serial.c
2560 create mode 100644 tools/kvm/hw/vesa.c
2561 create mode 100644 tools/kvm/include/asm/hweight.h
2562 create mode 100644 tools/kvm/include/bios/memcpy.h
2563 create mode 100644 tools/kvm/include/kvm/8250-serial.h
2564 create mode 100644 tools/kvm/include/kvm/apic.h
2565 create mode 100644 tools/kvm/include/kvm/brlock.h
2566 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
2567 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
2568 create mode 100644 tools/kvm/include/kvm/builtin-help.h
2569 create mode 100644 tools/kvm/include/kvm/builtin-list.h
2570 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
2571 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
2572 create mode 100644 tools/kvm/include/kvm/builtin-run.h
2573 create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
2574 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
2575 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
2576 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
2577 create mode 100644 tools/kvm/include/kvm/builtin-version.h
2578 create mode 100644 tools/kvm/include/kvm/compiler.h
2579 create mode 100644 tools/kvm/include/kvm/disk-image.h
2580 create mode 100644 tools/kvm/include/kvm/e820.h
2581 create mode 100644 tools/kvm/include/kvm/framebuffer.h
2582 create mode 100644 tools/kvm/include/kvm/guest_compat.h
2583 create mode 100644 tools/kvm/include/kvm/i8042.h
2584 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
2585 create mode 100644 tools/kvm/include/kvm/ioport.h
2586 create mode 100644 tools/kvm/include/kvm/irq.h
2587 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
2588 create mode 100644 tools/kvm/include/kvm/kvm-config.h
2589 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
2590 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
2591 create mode 100644 tools/kvm/include/kvm/kvm.h
2592 create mode 100644 tools/kvm/include/kvm/msi.h
2593 create mode 100644 tools/kvm/include/kvm/mutex.h
2594 create mode 100644 tools/kvm/include/kvm/parse-options.h
2595 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
2596 create mode 100644 tools/kvm/include/kvm/pci.h
2597 create mode 100644 tools/kvm/include/kvm/qcow.h
2598 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
2599 create mode 100644 tools/kvm/include/kvm/read-write.h
2600 create mode 100644 tools/kvm/include/kvm/rtc.h
2601 create mode 100644 tools/kvm/include/kvm/rwsem.h
2602 create mode 100644 tools/kvm/include/kvm/sdl.h
2603 create mode 100644 tools/kvm/include/kvm/segment.h
2604 create mode 100644 tools/kvm/include/kvm/strbuf.h
2605 create mode 100644 tools/kvm/include/kvm/symbol.h
2606 create mode 100644 tools/kvm/include/kvm/term.h
2607 create mode 100644 tools/kvm/include/kvm/threadpool.h
2608 create mode 100644 tools/kvm/include/kvm/types.h
2609 create mode 100644 tools/kvm/include/kvm/uip.h
2610 create mode 100644 tools/kvm/include/kvm/util-init.h
2611 create mode 100644 tools/kvm/include/kvm/util.h
2612 create mode 100644 tools/kvm/include/kvm/vesa.h
2613 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
2614 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
2615 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
2616 create mode 100644 tools/kvm/include/kvm/virtio-console.h
2617 create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
2618 create mode 100644 tools/kvm/include/kvm/virtio-net.h
2619 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
2620 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
2621 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
2622 create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
2623 create mode 100644 tools/kvm/include/kvm/virtio.h
2624 create mode 100644 tools/kvm/include/kvm/vnc.h
2625 create mode 100644 tools/kvm/include/linux/bitops.h
2626 create mode 100644 tools/kvm/include/linux/byteorder.h
2627 create mode 100644 tools/kvm/include/linux/compiler.h
2628 create mode 100644 tools/kvm/include/linux/kernel.h
2629 create mode 100644 tools/kvm/include/linux/module.h
2630 create mode 100644 tools/kvm/include/linux/prefetch.h
2631 create mode 100644 tools/kvm/include/linux/stddef.h
2632 create mode 100644 tools/kvm/include/linux/types.h
2633 create mode 100644 tools/kvm/ioeventfd.c
2634 create mode 100644 tools/kvm/ioport.c
2635 create mode 100644 tools/kvm/kvm-cmd.c
2636 create mode 100644 tools/kvm/kvm-cpu.c
2637 create mode 100644 tools/kvm/kvm-ipc.c
2638 create mode 100644 tools/kvm/kvm.c
2639 create mode 100644 tools/kvm/main.c
2640 create mode 100644 tools/kvm/mmio.c
2641 create mode 100644 tools/kvm/net/uip/arp.c
2642 create mode 100644 tools/kvm/net/uip/buf.c
2643 create mode 100644 tools/kvm/net/uip/core.c
2644 create mode 100644 tools/kvm/net/uip/csum.c
2645 create mode 100644 tools/kvm/net/uip/dhcp.c
2646 create mode 100644 tools/kvm/net/uip/icmp.c
2647 create mode 100644 tools/kvm/net/uip/ipv4.c
2648 create mode 100644 tools/kvm/net/uip/tcp.c
2649 create mode 100644 tools/kvm/net/uip/udp.c
2650 create mode 100644 tools/kvm/pci.c
2651 create mode 100644 tools/kvm/powerpc/boot.c
2652 create mode 100644 tools/kvm/powerpc/cpu_info.c
2653 create mode 100644 tools/kvm/powerpc/cpu_info.h
2654 create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
2655 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
2656 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
2657 create mode 100644 tools/kvm/powerpc/ioport.c
2658 create mode 100644 tools/kvm/powerpc/irq.c
2659 create mode 100644 tools/kvm/powerpc/kvm-cpu.c
2660 create mode 100644 tools/kvm/powerpc/kvm.c
2661 create mode 100644 tools/kvm/powerpc/spapr.h
2662 create mode 100644 tools/kvm/powerpc/spapr_hcall.c
2663 create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
2664 create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
2665 create mode 100644 tools/kvm/powerpc/spapr_pci.c
2666 create mode 100644 tools/kvm/powerpc/spapr_pci.h
2667 create mode 100644 tools/kvm/powerpc/spapr_rtas.c
2668 create mode 100644 tools/kvm/powerpc/xics.c
2669 create mode 100644 tools/kvm/powerpc/xics.h
2670 create mode 100644 tools/kvm/symbol.c
2671 create mode 100644 tools/kvm/term.c
2672 create mode 100644 tools/kvm/tests/Makefile
2673 create mode 100644 tools/kvm/tests/boot/Makefile
2674 create mode 100644 tools/kvm/tests/boot/init.c
2675 create mode 100644 tools/kvm/tests/kernel/.gitignore
2676 create mode 100644 tools/kvm/tests/kernel/Makefile
2677 create mode 100644 tools/kvm/tests/kernel/README
2678 create mode 100644 tools/kvm/tests/kernel/kernel.S
2679 create mode 100644 tools/kvm/tests/pit/.gitignore
2680 create mode 100644 tools/kvm/tests/pit/Makefile
2681 create mode 100644 tools/kvm/tests/pit/README
2682 create mode 100644 tools/kvm/tests/pit/tick.S
2683 create mode 100644 tools/kvm/ui/sdl.c
2684 create mode 100644 tools/kvm/ui/vnc.c
2685 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
2686 create mode 100755 tools/kvm/util/generate-cmdlist.sh
2687 create mode 100644 tools/kvm/util/init.c
2688 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
2689 create mode 100644 tools/kvm/util/parse-options.c
2690 create mode 100644 tools/kvm/util/rbtree-interval.c
2691 create mode 100644 tools/kvm/util/read-write.c
2692 create mode 100755 tools/kvm/util/set_private_br.sh
2693 create mode 100644 tools/kvm/util/strbuf.c
2694 create mode 100644 tools/kvm/util/threadpool.c
2695 create mode 100644 tools/kvm/util/util.c
2696 create mode 100644 tools/kvm/virtio/9p-pdu.c
2697 create mode 100644 tools/kvm/virtio/9p.c
2698 create mode 100644 tools/kvm/virtio/balloon.c
2699 create mode 100644 tools/kvm/virtio/blk.c
2700 create mode 100644 tools/kvm/virtio/console.c
2701 create mode 100644 tools/kvm/virtio/core.c
2702 create mode 100644 tools/kvm/virtio/mmio.c
2703 create mode 100644 tools/kvm/virtio/net.c
2704 create mode 100644 tools/kvm/virtio/pci.c
2705 create mode 100644 tools/kvm/virtio/rng.c
2706 create mode 100644 tools/kvm/virtio/scsi.c
2707 create mode 100644 tools/kvm/x86/bios.c
2708 create mode 100644 tools/kvm/x86/bios/.gitignore
2709 create mode 100644 tools/kvm/x86/bios/bios-rom.S
2710 create mode 100644 tools/kvm/x86/bios/e820.c
2711 create mode 100644 tools/kvm/x86/bios/entry.S
2712 create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
2713 create mode 100644 tools/kvm/x86/bios/int10.c
2714 create mode 100644 tools/kvm/x86/bios/int15.c
2715 create mode 100644 tools/kvm/x86/bios/local.S
2716 create mode 100644 tools/kvm/x86/bios/macro.S
2717 create mode 100644 tools/kvm/x86/bios/memcpy.c
2718 create mode 100644 tools/kvm/x86/bios/rom.ld.S
2719 create mode 100644 tools/kvm/x86/boot.c
2720 create mode 100644 tools/kvm/x86/cpuid.c
2721 create mode 100644 tools/kvm/x86/include/kvm/assembly.h
2722 create mode 100644 tools/kvm/x86/include/kvm/barrier.h
2723 create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
2724 create mode 100644 tools/kvm/x86/include/kvm/bios.h
2725 create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
2726 create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
2727 create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
2728 create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
2729 create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
2730 create mode 100644 tools/kvm/x86/include/kvm/mptable.h
2731 create mode 100644 tools/kvm/x86/interrupt.c
2732 create mode 100644 tools/kvm/x86/ioport.c
2733 create mode 100644 tools/kvm/x86/irq.c
2734 create mode 100644 tools/kvm/x86/kvm-cpu.c
2735 create mode 100644 tools/kvm/x86/kvm.c
2736 create mode 100644 tools/kvm/x86/mptable.c
2737 create mode 100644 tools/perf/Documentation/android.txt
2738 create mode 100644 tools/perf/util/machine.c
2739 create mode 100644 tools/perf/util/machine.h
2740 Merging rcu/rcu/next (1a0ec9c Merge branch 'tracing.2012.10.23c' into dev.3.8.2012.10.23d)
2741 $ git merge rcu/rcu/next
2742 Auto-merging kernel/sched/core.c
2743 Auto-merging kernel/cpu.c
2744 Auto-merging init/Kconfig
2745 Auto-merging include/linux/sched.h
2746 Merge made by the 'recursive' strategy.
2747 Documentation/RCU/RTFP.txt | 2 +-
2748 Documentation/RCU/checklist.txt | 17 +-
2749 Documentation/RCU/listRCU.txt | 2 +-
2750 Documentation/RCU/whatisRCU.txt | 17 +-
2751 Documentation/memory-barriers.txt | 9 +-
2752 arch/um/drivers/mconsole_kern.c | 2 +-
2753 include/linux/rculist.h | 17 --
2754 include/linux/rcupdate.h | 22 +++
2755 include/linux/sched.h | 10 +-
2756 include/linux/srcu.h | 34 ++++
2757 init/Kconfig | 15 +-
2759 kernel/ksysfs.c | 18 +++
2761 kernel/rcupdate.c | 54 +++++++
2762 kernel/rcutiny.c | 6 +-
2763 kernel/rcutiny_plugin.h | 61 ++++++-
2764 kernel/rcutorture.c | 54 +++----
2765 kernel/rcutree.c | 253 ++++++++++++++++++-----------
2766 kernel/rcutree.h | 24 +--
2767 kernel/rcutree_plugin.h | 18 ++-
2768 kernel/rcutree_trace.c | 322 ++++++++++++++++++-------------------
2769 kernel/sched/core.c | 8 +-
2770 kernel/srcu.c | 16 +-
2771 lib/Kconfig.debug | 2 +-
2772 25 files changed, 632 insertions(+), 369 deletions(-)
2773 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
2774 $ git merge cputime/cputime
2776 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
2777 $ git merge uprobes/for-next
2779 Merging kvm/linux-next (8ca40a7 KVM: Take kvm instead of vcpu to mmu_notifier_retry)
2780 $ git merge kvm/linux-next
2781 Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
2782 Resolved 'arch/powerpc/include/asm/kvm_para.h' using previous resolution.
2783 Auto-merging include/uapi/linux/kvm.h
2784 Auto-merging arch/x86/kvm/mmu.c
2785 Auto-merging arch/powerpc/kvm/trace.h
2786 Auto-merging arch/powerpc/kvm/book3s_hv.c
2787 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
2788 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
2789 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
2790 Auto-merging arch/powerpc/include/uapi/asm/kvm.h
2791 Auto-merging arch/powerpc/include/asm/kvm_para.h
2792 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h
2793 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
2794 Auto-merging arch/powerpc/include/asm/Kbuild
2795 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
2796 Automatic merge failed; fix conflicts and then commit the result.
2798 [master 6653a9d] Merge remote-tracking branch 'kvm/linux-next'
2799 $ git diff -M --stat --summary HEAD^..
2800 Documentation/virtual/kvm/api.txt | 82 ++++++-
2801 arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
2802 arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
2803 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
2804 arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
2805 arch/powerpc/include/asm/kvm_host.h | 38 ++-
2806 arch/powerpc/include/asm/kvm_para.h | 15 +-
2807 arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
2808 arch/powerpc/include/asm/reg_booke.h | 7 +
2809 arch/powerpc/include/uapi/asm/kvm.h | 59 +++++
2810 arch/powerpc/kernel/epapr_hcalls.S | 28 +++
2811 arch/powerpc/kernel/epapr_paravirt.c | 11 +-
2812 arch/powerpc/kernel/kvm.c | 2 +-
2813 arch/powerpc/kernel/ppc_ksyms.c | 5 +
2814 arch/powerpc/kvm/44x.c | 1 +
2815 arch/powerpc/kvm/44x_emulate.c | 110 +++++----
2816 arch/powerpc/kvm/Kconfig | 3 +
2817 arch/powerpc/kvm/book3s.c | 125 ++++++++++
2818 arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
2819 arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
2820 arch/powerpc/kvm/book3s_64_mmu_hv.c | 67 ++++--
2821 arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
2822 arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
2823 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
2824 arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
2825 arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
2826 arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
2827 arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
2828 arch/powerpc/kvm/booke_emulate.c | 22 +-
2829 arch/powerpc/kvm/e500.h | 3 +-
2830 arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
2831 arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
2832 arch/powerpc/kvm/trace.h | 200 +++++++++++++---
2833 arch/powerpc/platforms/Kconfig | 1 +
2834 arch/powerpc/sysdev/fsl_msi.c | 9 +-
2835 arch/powerpc/sysdev/fsl_soc.c | 2 +
2836 arch/s390/kvm/interrupt.c | 19 +-
2837 arch/s390/kvm/kvm-s390.c | 2 +-
2838 arch/x86/kvm/mmu.c | 45 ++--
2839 arch/x86/kvm/paging_tmpl.h | 115 ++++-----
2840 arch/x86/kvm/svm.c | 7 +-
2841 arch/x86/kvm/vmx.c | 45 ++--
2842 arch/x86/kvm/x86.c | 14 +-
2843 drivers/tty/Kconfig | 1 +
2844 drivers/virt/Kconfig | 1 +
2845 include/linux/kvm_host.h | 8 +-
2846 include/uapi/linux/kvm.h | 18 +-
2847 virt/kvm/iommu.c | 6 +-
2848 48 files changed, 1806 insertions(+), 508 deletions(-)
2849 $ git am -3 ../patches/0001-KVM-PPC-fix-fallout-from-UAPI-changes.patch
2850 Applying: KVM: PPC: fix fallout from UAPI changes
2852 Unstaged changes after reset:
2853 D arch/powerpc/include/asm/epapr_hcalls.h
2854 M arch/powerpc/include/uapi/asm/Kbuild
2855 M arch/powerpc/include/uapi/asm/kvm_para.h
2857 $ git commit -v -a --amend
2858 [master be708fa] Merge remote-tracking branch 'kvm/linux-next'
2859 Merging kvm-ppc/kvm-ppc-next (f37f444 KVM: PPC: Move mtspr/mfspr emulation into own functions)
2860 $ git merge kvm-ppc/kvm-ppc-next
2861 Merge made by the 'recursive' strategy.
2862 Documentation/virtual/kvm/api.txt | 3 +-
2863 arch/powerpc/kvm/44x_emulate.c | 2 +
2864 arch/powerpc/kvm/emulate.c | 221 ++++++++++++++++++++-----------------
2865 3 files changed, 125 insertions(+), 101 deletions(-)
2866 Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
2867 $ git merge oprofile/for-next
2869 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
2870 $ git merge xen/upstream/xen
2872 Merging xen-two/linux-next (ad50261 Merge branch 'stable/for-linus-3.7' into linux-next)
2873 $ git merge xen-two/linux-next
2874 Merge made by the 'recursive' strategy.
2875 drivers/net/xen-netback/netback.c | 11 ++++++--
2876 drivers/xen/grant-table.c | 53 ------------------------------------
2877 drivers/xen/xenbus/xenbus_client.c | 6 ++--
2878 include/xen/grant_table.h | 12 --------
2879 4 files changed, 12 insertions(+), 70 deletions(-)
2880 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
2881 $ git merge xen-pvhvm/linux-next
2883 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
2884 $ git merge percpu/for-next
2886 Merging workqueues/for-next (8b57f8d Merge branch 'for-3.7-fixes' into for-next)
2887 $ git merge workqueues/for-next
2888 Merge made by the 'recursive' strategy.
2889 kernel/workqueue.c | 8 ++++++--
2890 1 file changed, 6 insertions(+), 2 deletions(-)
2891 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
2892 $ git merge drivers-x86/linux-next
2893 Auto-merging drivers/platform/x86/asus-wmi.c
2894 Merge made by the 'recursive' strategy.
2895 drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
2896 1 file changed, 76 insertions(+)
2897 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
2898 $ git merge hwpoison/hwpoison
2900 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
2901 $ git merge sysctl/master
2903 Merging regmap/for-next (97f99c4 Merge tag 'regmap-fix-mmio' into regmap-next)
2904 $ git merge regmap/for-next
2905 Merge made by the 'recursive' strategy.
2906 drivers/base/regmap/internal.h | 4 +--
2907 drivers/base/regmap/regmap-irq.c | 19 +++++++++++
2908 drivers/base/regmap/regmap.c | 67 ++++++++++++++++++++++----------------
2909 include/linux/regmap.h | 18 +++++++++-
2910 4 files changed, 76 insertions(+), 32 deletions(-)
2911 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
2912 $ git merge hsi/for-next
2914 Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
2915 $ git merge leds/for-next
2917 Merging driver-core/driver-core-next (967857d drivers/base: remove CONFIG_EXPERIMENTAL)
2918 $ git merge driver-core/driver-core-next
2919 Auto-merging drivers/base/Kconfig
2920 Merge made by the 'recursive' strategy.
2921 drivers/base/Kconfig | 7 +++----
2922 1 file changed, 3 insertions(+), 4 deletions(-)
2923 Merging tty/tty-next (84fd7bd tty: Add get- ioctls to fetch tty status v3)
2924 $ git merge tty/tty-next
2925 Auto-merging fs/compat_ioctl.c
2926 Auto-merging drivers/tty/serial/omap-serial.c
2927 Merge made by the 'recursive' strategy.
2928 .../devicetree/bindings/tty/serial/of-serial.txt | 5 +-
2929 arch/alpha/include/asm/ioctls.h | 3 +
2930 arch/arm/plat-omap/include/plat/serial.h | 9 -
2931 arch/mips/include/uapi/asm/ioctls.h | 3 +
2932 arch/parisc/include/uapi/asm/ioctls.h | 3 +
2933 arch/powerpc/include/uapi/asm/ioctls.h | 3 +
2934 arch/sh/include/uapi/asm/ioctls.h | 3 +
2935 arch/sparc/include/uapi/asm/ioctls.h | 3 +
2936 arch/x86/platform/ce4100/ce4100.c | 3 +
2937 arch/xtensa/include/uapi/asm/ioctls.h | 3 +
2938 drivers/bluetooth/hci_ldisc.c | 7 +-
2939 drivers/staging/dgrp/dgrp_common.h | 1 -
2940 drivers/staging/dgrp/dgrp_driver.c | 4 -
2941 drivers/staging/dgrp/dgrp_net_ops.c | 67 +-
2942 drivers/staging/dgrp/dgrp_specproc.c | 2 -
2943 drivers/staging/dgrp/dgrp_sysfs.c | 18 -
2944 drivers/tty/hvc/hvcs.c | 4 +-
2945 drivers/tty/n_tty.c | 752 +++++++++++---------
2946 drivers/tty/pty.c | 77 +-
2947 drivers/tty/serial/8250/8250.c | 9 +-
2948 drivers/tty/serial/8250/8250.h | 36 +
2949 drivers/tty/serial/8250/8250_dw.c | 25 +
2950 drivers/tty/serial/8250/8250_early.c | 2 +-
2951 drivers/tty/serial/8250/8250_pci.c | 6 +-
2952 drivers/tty/serial/amba-pl011.c | 25 +-
2953 drivers/tty/serial/clps711x.c | 595 +++++++---------
2954 drivers/tty/serial/ifx6x60.c | 76 +-
2955 drivers/tty/serial/ifx6x60.h | 1 +
2956 drivers/tty/serial/of_serial.c | 32 +-
2957 drivers/tty/serial/omap-serial.c | 20 +-
2958 drivers/tty/serial/pxa.c | 55 ++
2959 drivers/tty/serial/samsung.c | 16 +-
2960 drivers/tty/serial/vt8500_serial.c | 8 +-
2961 drivers/tty/tty_audit.c | 15 +-
2962 drivers/tty/tty_buffer.c | 228 +++---
2963 drivers/tty/tty_io.c | 20 +-
2964 drivers/tty/tty_ioctl.c | 21 -
2965 drivers/tty/tty_ldisc.c | 47 +-
2966 drivers/tty/tty_mutex.c | 4 +-
2967 drivers/tty/tty_port.c | 2 +
2968 drivers/tty/vt/selection.c | 9 +-
2969 fs/compat_ioctl.c | 3 +
2970 fs/devpts/inode.c | 61 +-
2971 include/linux/devpts_fs.h | 20 +-
2972 include/linux/tty.h | 44 +-
2973 include/linux/tty_flip.h | 2 +-
2974 include/uapi/asm-generic/ioctls.h | 3 +
2975 kernel/auditsc.c | 2 +-
2976 kernel/printk.c | 12 +-
2977 49 files changed, 1284 insertions(+), 1085 deletions(-)
2978 Merging usb/usb-next (d124a60 USB: isp1760-if: Change to use irq_of_parse_and_map)
2979 $ git merge usb/usb-next
2980 Resolved 'drivers/usb/misc/ezusb.c' using previous resolution.
2981 Auto-merging drivers/usb/misc/ezusb.c
2982 CONFLICT (content): Merge conflict in drivers/usb/misc/ezusb.c
2983 Removing drivers/usb/host/ohci-xls.c
2984 Removing drivers/usb/host/ohci-sh.c
2985 Removing drivers/usb/host/ohci-ppc-soc.c
2986 Removing drivers/usb/host/ohci-pnx8550.c
2987 Removing drivers/usb/host/ohci-cns3xxx.c
2988 Removing drivers/usb/host/ohci-au1xxx.c
2989 Removing drivers/usb/host/ehci-xls.c
2990 Removing drivers/usb/host/ehci-ls1x.c
2991 Removing drivers/usb/host/ehci-ixp4xx.c
2992 Removing drivers/usb/host/ehci-cns3xxx.c
2993 Removing drivers/usb/host/ehci-au1xxx.c
2994 Auto-merging drivers/usb/core/hub.c
2995 Automatic merge failed; fix conflicts and then commit the result.
2997 [master 6016d51] Merge remote-tracking branch 'usb/usb-next'
2998 $ git diff -M --stat --summary HEAD^..
2999 Documentation/usb/error-codes.txt | 5 +-
3000 arch/arm/mach-cns3xxx/cns3420vb.c | 54 ++++-
3001 arch/mips/alchemy/common/Makefile | 2 +-
3002 arch/mips/alchemy/common/platform.c | 58 ++++-
3003 .../mips/alchemy/common/usb.c | 0
3004 arch/mips/configs/db1000_defconfig | 1 +
3005 arch/mips/configs/db1235_defconfig | 2 +
3006 arch/mips/configs/gpr_defconfig | 1 +
3007 arch/mips/configs/ls1b_defconfig | 1 +
3008 arch/mips/configs/mtx1_defconfig | 1 +
3009 arch/mips/loongson1/common/platform.c | 8 +-
3010 arch/mips/netlogic/xlr/platform.c | 17 +-
3011 arch/mips/pnx8550/common/platform.c | 31 ++-
3012 arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +-
3013 arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 +-
3014 arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 +-
3015 arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 6 +-
3016 drivers/usb/core/devices.c | 18 +-
3017 drivers/usb/core/hcd.c | 19 +-
3018 drivers/usb/core/hub.c | 75 ++++++
3019 drivers/usb/core/urb.c | 22 +-
3020 drivers/usb/core/usb.c | 4 +-
3021 drivers/usb/host/Kconfig | 28 +--
3022 drivers/usb/host/Makefile | 1 -
3023 drivers/usb/host/ehci-au1xxx.c | 184 ---------------
3024 drivers/usb/host/ehci-cns3xxx.c | 155 -------------
3025 drivers/usb/host/ehci-dbg.c | 15 --
3026 drivers/usb/host/ehci-hcd.c | 54 ++---
3027 drivers/usb/host/ehci-hub.c | 23 +-
3028 drivers/usb/host/ehci-ixp4xx.c | 139 -----------
3029 drivers/usb/host/ehci-lpm.c | 23 +-
3030 drivers/usb/host/ehci-ls1x.c | 147 ------------
3031 drivers/usb/host/ehci-pci.c | 17 --
3032 drivers/usb/host/ehci-platform.c | 24 +-
3033 drivers/usb/host/ehci-s5p.c | 10 +-
3034 drivers/usb/host/ehci-sched.c | 132 +++++------
3035 drivers/usb/host/ehci-tegra.c | 5 +-
3036 drivers/usb/host/ehci-vt8500.c | 16 --
3037 drivers/usb/host/ehci-w90x900.c | 2 +-
3038 drivers/usb/host/ehci-xls.c | 142 ------------
3039 drivers/usb/host/ehci.h | 28 ++-
3040 drivers/usb/host/isp1760-if.c | 7 +-
3041 drivers/usb/host/ohci-at91.c | 2 +-
3042 drivers/usb/host/ohci-au1xxx.c | 234 -------------------
3043 drivers/usb/host/ohci-cns3xxx.c | 166 -------------
3044 drivers/usb/host/ohci-ep93xx.c | 2 +-
3045 drivers/usb/host/ohci-exynos.c | 22 +-
3046 drivers/usb/host/ohci-hcd.c | 139 ++++++++---
3047 drivers/usb/host/ohci-hub.c | 42 ----
3048 drivers/usb/host/ohci-omap.c | 2 +-
3049 drivers/usb/host/ohci-pci.c | 47 +---
3050 drivers/usb/host/ohci-platform.c | 28 +--
3051 drivers/usb/host/ohci-pnx8550.c | 243 --------------------
3052 drivers/usb/host/ohci-ppc-soc.c | 216 -----------------
3053 drivers/usb/host/ohci-pxa27x.c | 2 +-
3054 drivers/usb/host/ohci-q.c | 4 +-
3055 drivers/usb/host/ohci-s3c2410.c | 35 +--
3056 drivers/usb/host/ohci-sh.c | 141 ------------
3057 drivers/usb/host/ohci-sm501.c | 2 +-
3058 drivers/usb/host/ohci-spear.c | 2 +-
3059 drivers/usb/host/ohci-tmio.c | 2 +-
3060 drivers/usb/host/ohci-xls.c | 152 ------------
3061 drivers/usb/host/r8a66597-hcd.c | 6 +-
3062 drivers/usb/host/uhci-q.c | 73 +++---
3063 drivers/usb/misc/ezusb.c | 38 +--
3064 drivers/usb/phy/tegra_usb_phy.c | 4 +-
3065 drivers/usb/serial/ftdi_sio.c | 60 +++++
3066 drivers/usb/usb-skeleton.c | 13 +-
3067 drivers/usb/wusbcore/devconnect.c | 13 --
3068 drivers/uwb/umc-bus.c | 2 +-
3069 include/linux/usb.h | 34 +--
3070 include/linux/usb/ehci_pdriver.h | 3 +
3071 include/linux/usb/ezusb.h | 8 -
3072 include/linux/usb/ohci_pdriver.h | 2 +
3073 74 files changed, 776 insertions(+), 2458 deletions(-)
3074 rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
3075 delete mode 100644 drivers/usb/host/ehci-au1xxx.c
3076 delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
3077 delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
3078 delete mode 100644 drivers/usb/host/ehci-ls1x.c
3079 delete mode 100644 drivers/usb/host/ehci-xls.c
3080 delete mode 100644 drivers/usb/host/ohci-au1xxx.c
3081 delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
3082 delete mode 100644 drivers/usb/host/ohci-pnx8550.c
3083 delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
3084 delete mode 100644 drivers/usb/host/ohci-sh.c
3085 delete mode 100644 drivers/usb/host/ohci-xls.c
3086 Merging staging/staging-next (94b1230 staging: csr: csr_log.h: Fix coding style)
3087 $ git merge staging/staging-next
3088 Resolved 'drivers/staging/comedi/drivers/amplc_dio200.c' using previous resolution.
3089 Auto-merging drivers/staging/omapdrm/omap_gem.c
3090 Auto-merging drivers/staging/ipack/carriers/tpci200.h
3091 Auto-merging drivers/staging/ipack/carriers/tpci200.c
3092 Removing drivers/staging/ipack/bridges/Kconfig
3093 Auto-merging drivers/staging/iio/imu/adis16400_core.c
3094 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
3095 Auto-merging drivers/staging/iio/accel/adis16240_core.c
3096 Auto-merging drivers/staging/iio/accel/adis16220_core.c
3097 Auto-merging drivers/staging/iio/accel/adis16209_core.c
3098 Auto-merging drivers/staging/iio/accel/adis16204_core.c
3099 Auto-merging drivers/staging/iio/accel/adis16203_core.c
3100 Auto-merging drivers/staging/iio/accel/adis16201_core.c
3101 Auto-merging drivers/staging/dgrp/dgrp_sysfs.c
3102 Auto-merging drivers/staging/dgrp/dgrp_net_ops.c
3103 Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
3104 Removing drivers/staging/comedi/drivers/mpc8260cpm.c
3105 Auto-merging drivers/staging/comedi/drivers/das08.c
3106 Auto-merging drivers/staging/comedi/drivers/amplc_pc263.c
3107 Auto-merging drivers/staging/comedi/drivers/amplc_pc236.c
3108 Auto-merging drivers/staging/comedi/drivers/amplc_dio200.c
3109 CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/amplc_dio200.c
3110 Auto-merging drivers/staging/comedi/drivers/8255_pci.c
3111 Auto-merging drivers/staging/android/binder.c
3112 Automatic merge failed; fix conflicts and then commit the result.
3114 [master 8b7456b] Merge remote-tracking branch 'staging/staging-next'
3115 $ git diff -M --stat --summary HEAD^..
3116 drivers/iio/accel/Kconfig | 2 +-
3117 drivers/iio/adc/at91_adc.c | 21 +-
3118 drivers/iio/dac/Kconfig | 12 +-
3119 drivers/iio/dac/Makefile | 1 +
3120 drivers/iio/dac/ad5449.c | 375 ++++++
3121 drivers/iio/dac/ad5686.c | 2 +-
3122 drivers/iio/industrialio-buffer.c | 6 +-
3123 drivers/iio/industrialio-core.c | 5 +
3124 drivers/iio/industrialio-event.c | 4 +-
3125 drivers/iio/inkern.c | 5 +-
3126 drivers/staging/android/Makefile | 2 +
3127 drivers/staging/android/binder.c | 95 +-
3128 drivers/staging/android/binder_trace.h | 327 +++++
3129 drivers/staging/bcm/CmHost.c | 30 +-
3130 drivers/staging/bcm/InterfaceIdleMode.h | 5 +-
3131 drivers/staging/bcm/InterfaceMisc.c | 114 +-
3132 drivers/staging/bcm/LeakyBucket.c | 6 +-
3133 drivers/staging/bcm/Misc.c | 222 +--
3134 drivers/staging/bcm/Prototypes.h | 8 +-
3135 drivers/staging/ccg/ccg.c | 8 +-
3136 drivers/staging/ced1401/ced_ioc.c | 30 +-
3137 drivers/staging/ced1401/usb1401.c | 29 +-
3138 drivers/staging/comedi/Kconfig | 6 +-
3139 drivers/staging/comedi/comedi.h | 27 +-
3140 drivers/staging/comedi/comedidev.h | 25 +-
3141 drivers/staging/comedi/drivers.c | 1 +
3142 drivers/staging/comedi/drivers/8255_pci.c | 13 +-
3143 .../comedi/drivers/addi-data/APCI1710_82x54.c | 8 +-
3144 .../comedi/drivers/addi-data/APCI1710_Chrono.c | 7 +
3145 .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 +
3146 .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 42 +
3147 .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 5 +-
3148 .../comedi/drivers/addi-data/APCI1710_Pwm.c | 9 +-
3149 .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +
3150 .../comedi/drivers/addi-data/APCI1710_Tor.c | 5 +-
3151 .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 +
3152 .../staging/comedi/drivers/addi-data/addi_common.c | 68 +-
3153 .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 +
3154 .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +
3155 .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 1 -
3156 .../comedi/drivers/addi-data/hwdrv_apci035.c | 14 +
3157 .../comedi/drivers/addi-data/hwdrv_apci035.h | 1 -
3158 .../comedi/drivers/addi-data/hwdrv_apci1032.c | 11 +-
3159 .../comedi/drivers/addi-data/hwdrv_apci1032.h | 1 -
3160 .../comedi/drivers/addi-data/hwdrv_apci1500.c | 19 +-
3161 .../comedi/drivers/addi-data/hwdrv_apci1500.h | 1 -
3162 .../comedi/drivers/addi-data/hwdrv_apci1516.c | 17 +-
3163 .../comedi/drivers/addi-data/hwdrv_apci1516.h | 1 -
3164 .../comedi/drivers/addi-data/hwdrv_apci1564.c | 16 +
3165 .../comedi/drivers/addi-data/hwdrv_apci1564.h | 1 -
3166 .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 4 +
3167 .../comedi/drivers/addi-data/hwdrv_apci2016.c | 12 +
3168 .../comedi/drivers/addi-data/hwdrv_apci2016.h | 1 -
3169 .../comedi/drivers/addi-data/hwdrv_apci2032.c | 14 +
3170 .../comedi/drivers/addi-data/hwdrv_apci2032.h | 1 -
3171 .../comedi/drivers/addi-data/hwdrv_apci2200.c | 19 +-
3172 .../comedi/drivers/addi-data/hwdrv_apci2200.h | 1 -
3173 .../comedi/drivers/addi-data/hwdrv_apci3120.c | 37 +-
3174 .../comedi/drivers/addi-data/hwdrv_apci3120.h | 1 -
3175 .../comedi/drivers/addi-data/hwdrv_apci3200.c | 28 +-
3176 .../comedi/drivers/addi-data/hwdrv_apci3200.h | 1 -
3177 .../comedi/drivers/addi-data/hwdrv_apci3501.c | 18 +
3178 .../comedi/drivers/addi-data/hwdrv_apci3501.h | 1 -
3179 .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 16 +
3180 drivers/staging/comedi/drivers/adl_pci6208.c | 10 +-
3181 drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 -
3182 drivers/staging/comedi/drivers/adl_pci8164.c | 14 +-
3183 drivers/staging/comedi/drivers/adl_pci9111.c | 9 +-
3184 drivers/staging/comedi/drivers/adl_pci9118.c | 10 +-
3185 drivers/staging/comedi/drivers/adq12b.c | 46 +-
3186 drivers/staging/comedi/drivers/adv_pci1710.c | 12 +-
3187 drivers/staging/comedi/drivers/adv_pci1723.c | 11 +-
3188 drivers/staging/comedi/drivers/adv_pci_dio.c | 12 +-
3189 drivers/staging/comedi/drivers/aio_aio12_8.c | 8 +-
3190 drivers/staging/comedi/drivers/aio_iiro_16.c | 19 +-
3191 drivers/staging/comedi/drivers/amplc_dio200.c | 1415 ++++++++++++++------
3192 drivers/staging/comedi/drivers/amplc_pc236.c | 26 +-
3193 drivers/staging/comedi/drivers/amplc_pc263.c | 1 -
3194 drivers/staging/comedi/drivers/amplc_pci224.c | 23 +-
3195 drivers/staging/comedi/drivers/amplc_pci230.c | 22 +-
3196 drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-
3197 drivers/staging/comedi/drivers/cb_pcidas.c | 13 +-
3198 drivers/staging/comedi/drivers/cb_pcidas64.c | 917 +++++++------
3199 drivers/staging/comedi/drivers/cb_pcidda.c | 668 +++------
3200 drivers/staging/comedi/drivers/cb_pcimdas.c | 108 +-
3201 drivers/staging/comedi/drivers/cb_pcimdda.c | 12 +-
3202 drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
3203 drivers/staging/comedi/drivers/comedi_parport.c | 8 +-
3204 drivers/staging/comedi/drivers/comedi_test.c | 8 +-
3205 drivers/staging/comedi/drivers/contec_pci_dio.c | 2 -
3206 drivers/staging/comedi/drivers/daqboard2000.c | 10 +-
3207 drivers/staging/comedi/drivers/das08.c | 25 +-
3208 drivers/staging/comedi/drivers/das08_cs.c | 9 +-
3209 drivers/staging/comedi/drivers/das16.c | 23 +-
3210 drivers/staging/comedi/drivers/das16m1.c | 49 +-
3211 drivers/staging/comedi/drivers/das1800.c | 28 +-
3212 drivers/staging/comedi/drivers/das6402.c | 16 +-
3213 drivers/staging/comedi/drivers/das800.c | 18 +-
3214 drivers/staging/comedi/drivers/dmm32at.c | 27 +-
3215 drivers/staging/comedi/drivers/dt2801.c | 14 +-
3216 drivers/staging/comedi/drivers/dt2811.c | 13 +-
3217 drivers/staging/comedi/drivers/dt2814.c | 12 +-
3218 drivers/staging/comedi/drivers/dt2815.c | 9 +-
3219 drivers/staging/comedi/drivers/dt282x.c | 33 +-
3220 drivers/staging/comedi/drivers/dt3000.c | 27 +-
3221 drivers/staging/comedi/drivers/dt9812.c | 27 +-
3222 drivers/staging/comedi/drivers/dyna_pci10xx.c | 14 +-
3223 drivers/staging/comedi/drivers/fl512.c | 10 +-
3224 drivers/staging/comedi/drivers/gsc_hpdi.c | 343 ++---
3225 drivers/staging/comedi/drivers/icp_multi.c | 9 +-
3226 drivers/staging/comedi/drivers/ii_pci20kc.c | 51 +-
3227 drivers/staging/comedi/drivers/jr3_pci.c | 37 +-
3228 drivers/staging/comedi/drivers/jr3_pci.h | 12 +-
3229 drivers/staging/comedi/drivers/ke_counter.c | 47 +-
3230 drivers/staging/comedi/drivers/me4000.c | 12 +-
3231 drivers/staging/comedi/drivers/me_daq.c | 42 +-
3232 drivers/staging/comedi/drivers/mpc624.c | 10 +-
3233 drivers/staging/comedi/drivers/mpc8260cpm.c | 164 ---
3234 drivers/staging/comedi/drivers/multiq3.c | 11 +-
3235 drivers/staging/comedi/drivers/ni_6527.c | 23 +-
3236 drivers/staging/comedi/drivers/ni_65xx.c | 122 +-
3237 drivers/staging/comedi/drivers/ni_660x.c | 585 ++++----
3238 drivers/staging/comedi/drivers/ni_670x.c | 9 +-
3239 drivers/staging/comedi/drivers/ni_at_a2150.c | 20 +-
3240 drivers/staging/comedi/drivers/ni_at_ao.c | 13 +-
3241 drivers/staging/comedi/drivers/ni_atmio.c | 11 +-
3242 drivers/staging/comedi/drivers/ni_atmio16d.c | 15 +-
3243 drivers/staging/comedi/drivers/ni_daq_dio24.c | 14 +-
3244 drivers/staging/comedi/drivers/ni_labpc.c | 47 +-
3245 drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-
3246 drivers/staging/comedi/drivers/ni_mio_common.c | 150 ++-
3247 drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +-
3248 drivers/staging/comedi/drivers/ni_pcidio.c | 36 +-
3249 drivers/staging/comedi/drivers/ni_pcimio.c | 49 +-
3250 drivers/staging/comedi/drivers/pcl711.c | 15 +-
3251 drivers/staging/comedi/drivers/pcl726.c | 10 +-
3252 drivers/staging/comedi/drivers/pcl812.c | 27 +-
3253 drivers/staging/comedi/drivers/pcl816.c | 21 +-
3254 drivers/staging/comedi/drivers/pcl818.c | 32 +-
3255 drivers/staging/comedi/drivers/pcm3724.c | 44 +-
3256 drivers/staging/comedi/drivers/pcmad.c | 10 +-
3257 drivers/staging/comedi/drivers/pcmda12.c | 34 +-
3258 drivers/staging/comedi/drivers/pcmmio.c | 124 +-
3259 drivers/staging/comedi/drivers/pcmuio.c | 25 +-
3260 drivers/staging/comedi/drivers/poc.c | 15 +-
3261 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 34 +-
3262 drivers/staging/comedi/drivers/rtd520.c | 36 +-
3263 drivers/staging/comedi/drivers/rti800.c | 13 +-
3264 drivers/staging/comedi/drivers/rti802.c | 9 +-
3265 drivers/staging/comedi/drivers/s526.c | 8 +-
3266 drivers/staging/comedi/drivers/s626.c | 39 +-
3267 drivers/staging/comedi/drivers/serial2002.c | 44 +-
3268 drivers/staging/comedi/drivers/skel.c | 18 +-
3269 drivers/staging/comedi/drivers/ssv_dnp.c | 26 +-
3270 drivers/staging/comedi/drivers/unioxx5.c | 44 +-
3271 drivers/staging/comedi/drivers/usbdux.c | 10 +-
3272 drivers/staging/comedi/drivers/usbduxfast.c | 152 +--
3273 drivers/staging/comedi/drivers/vmk80xx.c | 13 +-
3274 .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 +-
3275 drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
3276 drivers/staging/csr/bh.c | 19 +-
3277 drivers/staging/csr/csr_framework_ext.c | 2 -
3278 drivers/staging/csr/csr_framework_ext.h | 49 -
3279 drivers/staging/csr/csr_framework_ext_types.h | 34 +-
3280 drivers/staging/csr/csr_log.h | 165 ++-
3281 drivers/staging/csr/csr_log_configure.h | 100 +-
3282 drivers/staging/csr/csr_sched.h | 97 +-
3283 drivers/staging/csr/csr_time.c | 9 +-
3284 drivers/staging/csr/csr_time.h | 74 +-
3285 drivers/staging/csr/csr_wifi_hip_dump.c | 4 +-
3286 drivers/staging/csr/csr_wifi_hip_signals.h | 8 +-
3287 drivers/staging/csr/csr_wifi_hip_unifi.h | 2 +-
3288 drivers/staging/csr/csr_wifi_router_ctrl_sef.c | 67 +-
3289 .../csr/csr_wifi_router_free_upstream_contents.c | 46 +-
3290 drivers/staging/csr/csr_wifi_sme_sef.h | 204 +--
3291 drivers/staging/csr/csr_wifi_sme_serialize.h | 328 ++---
3292 drivers/staging/csr/csr_wifi_sme_task.h | 8 +-
3293 drivers/staging/csr/data_tx.c | 45 +-
3294 drivers/staging/csr/io.c | 1 -
3295 drivers/staging/csr/monitor.c | 1 -
3296 drivers/staging/csr/netdev.c | 9 +-
3297 drivers/staging/csr/sdio_mmc.c | 1 -
3298 drivers/staging/csr/sme_native.c | 1 -
3299 drivers/staging/csr/sme_sys.c | 11 +-
3300 drivers/staging/csr/sme_userspace.h | 2 +-
3301 drivers/staging/csr/ul_int.c | 1 -
3302 drivers/staging/csr/unifi_pdu_processing.c | 17 +-
3303 drivers/staging/csr/unifi_priv.h | 7 +-
3304 drivers/staging/csr/unifi_wext.h | 1 -
3305 drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +-
3306 drivers/staging/dgrp/dgrp_net_ops.c | 3 +
3307 drivers/staging/dgrp/dgrp_sysfs.c | 3 +-
3308 drivers/staging/et131x/et131x.c | 269 ++--
3309 drivers/staging/gdm72xx/gdm_wimax.c | 5 +-
3310 drivers/staging/gdm72xx/sdio_boot.c | 81 +-
3311 drivers/staging/iio/accel/adis16201_core.c | 4 +-
3312 drivers/staging/iio/accel/adis16203_core.c | 2 -
3313 drivers/staging/iio/accel/adis16204_core.c | 4 +-
3314 drivers/staging/iio/accel/adis16209_core.c | 6 +-
3315 drivers/staging/iio/accel/adis16209_trigger.c | 11 +-
3316 drivers/staging/iio/accel/adis16220_core.c | 2 -
3317 drivers/staging/iio/accel/adis16240_core.c | 2 -
3318 drivers/staging/iio/accel/adis16240_trigger.c | 11 +-
3319 drivers/staging/iio/accel/kxsd9.c | 2 +-
3320 drivers/staging/iio/accel/lis3l02dq.h | 1 +
3321 drivers/staging/iio/accel/lis3l02dq_core.c | 10 +-
3322 drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +-
3323 drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
3324 drivers/staging/iio/adc/mxs-lradc.c | 2 +-
3325 drivers/staging/iio/cdc/ad7150.c | 12 +-
3326 drivers/staging/iio/cdc/ad7152.c | 2 +-
3327 drivers/staging/iio/cdc/ad7746.c | 2 +-
3328 drivers/staging/iio/gyro/adis16260_core.c | 6 +-
3329 drivers/staging/iio/iio_dummy_evgen.c | 2 +-
3330 drivers/staging/iio/imu/adis16400_core.c | 10 +-
3331 drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
3332 drivers/staging/iio/meter/ade7753.h | 2 -
3333 drivers/staging/iio/meter/ade7754.h | 2 -
3334 drivers/staging/iio/meter/ade7758.h | 3 -
3335 drivers/staging/iio/meter/ade7759.h | 2 -
3336 drivers/staging/iio/meter/ade7854.h | 2 -
3337 drivers/staging/imx-drm/ipu-v3/ipu-common.c | 28 +-
3338 drivers/staging/ipack/Kconfig | 15 +-
3339 drivers/staging/ipack/Makefile | 2 +-
3340 drivers/staging/ipack/bridges/Kconfig | 8 -
3341 drivers/staging/ipack/carriers/Kconfig | 7 +
3342 .../staging/ipack/{bridges => carriers}/Makefile | 0
3343 .../staging/ipack/{bridges => carriers}/tpci200.c | 309 ++---
3344 .../staging/ipack/{bridges => carriers}/tpci200.h | 23 +-
3345 drivers/staging/ipack/devices/Kconfig | 1 -
3346 drivers/staging/ipack/devices/ipoctal.c | 118 +-
3347 drivers/staging/ipack/ipack.c | 45 +-
3348 drivers/staging/ipack/ipack.h | 58 +-
3349 drivers/staging/line6/audio.c | 8 +-
3350 drivers/staging/line6/driver.c | 20 +-
3351 drivers/staging/line6/driver.h | 2 -
3352 drivers/staging/olpc_dcon/olpc_dcon.c | 83 +-
3353 drivers/staging/olpc_dcon/olpc_dcon.h | 2 +-
3354 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 30 -
3355 drivers/staging/omapdrm/omap_crtc.c | 2 +-
3356 drivers/staging/omapdrm/omap_dmm_priv.h | 9 +-
3357 drivers/staging/omapdrm/omap_dmm_tiler.c | 106 +-
3358 drivers/staging/omapdrm/omap_dmm_tiler.h | 7 +-
3359 drivers/staging/omapdrm/omap_fb.c | 14 +-
3360 drivers/staging/omapdrm/omap_gem.c | 2 +-
3361 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 +-
3362 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
3363 drivers/staging/rts5139/Makefile | 22 +-
3364 drivers/staging/rts5139/ms.c | 96 +-
3365 drivers/staging/rts5139/ms.h | 18 +-
3366 drivers/staging/rts5139/ms_mg.c | 104 +-
3367 drivers/staging/rts5139/ms_mg.h | 14 +-
3368 drivers/staging/rts5139/rts51x.c | 10 +-
3369 drivers/staging/rts5139/rts51x_card.c | 80 +-
3370 drivers/staging/rts5139/rts51x_card.h | 30 +-
3371 drivers/staging/rts5139/rts51x_chip.c | 24 +-
3372 drivers/staging/rts5139/rts51x_chip.h | 16 +-
3373 drivers/staging/rts5139/rts51x_fop.c | 6 +-
3374 drivers/staging/rts5139/rts51x_scsi.c | 238 ++--
3375 drivers/staging/rts5139/rts51x_scsi.h | 6 +-
3376 drivers/staging/rts5139/sd.c | 36 +-
3377 drivers/staging/rts5139/sd.h | 12 +-
3378 drivers/staging/rts5139/sd_cprm.c | 124 +-
3379 drivers/staging/rts5139/sd_cprm.h | 18 +-
3380 drivers/staging/rts5139/xd.c | 58 +-
3381 drivers/staging/rts5139/xd.h | 10 +-
3382 drivers/staging/sbe-2t3e3/cpld.c | 2 +-
3383 drivers/staging/sbe-2t3e3/main.c | 7 +-
3384 drivers/staging/sbe-2t3e3/module.c | 11 +-
3385 drivers/staging/sbe-2t3e3/netdev.c | 5 +-
3386 drivers/staging/silicom/bp_mod.c | 11 +-
3387 drivers/staging/silicom/bp_proc.c | 85 +-
3388 drivers/staging/silicom/bypasslib/bplibk.h | 1 +
3389 drivers/staging/silicom/bypasslib/bypass.c | 1 -
3390 drivers/staging/slicoss/slicoss.c | 157 +--
3391 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 24 +-
3392 drivers/staging/usbip/stub_dev.c | 13 +-
3393 drivers/staging/usbip/stub_rx.c | 5 +-
3394 drivers/staging/usbip/stub_tx.c | 3 +-
3395 drivers/staging/usbip/usbip_common.c | 40 +-
3396 drivers/staging/usbip/usbip_common.h | 4 +-
3397 drivers/staging/usbip/vhci.h | 1 -
3398 drivers/staging/usbip/vhci_hcd.c | 49 +-
3399 drivers/staging/usbip/vhci_rx.c | 2 +-
3400 drivers/staging/usbip/vhci_sysfs.c | 6 +-
3401 drivers/staging/usbip/vhci_tx.c | 2 +-
3402 drivers/staging/vt6655/hostap.c | 6 +-
3403 drivers/staging/vt6655/rxtx.c | 2 +-
3404 drivers/staging/vt6655/wcmd.c | 1 +
3405 drivers/staging/vt6656/device.h | 1 -
3406 drivers/staging/vt6656/firmware.c | 22 +-
3407 drivers/staging/vt6656/hostap.c | 6 +-
3408 drivers/staging/vt6656/main_usb.c | 1 -
3409 drivers/staging/vt6656/rf.c | 3 +
3410 drivers/staging/vt6656/rxtx.c | 2 +-
3411 drivers/staging/vt6656/usbpipe.c | 1 +
3412 drivers/staging/winbond/mds.c | 2 +-
3413 drivers/staging/winbond/wbhal.h | 4 +-
3414 drivers/staging/wlags49_h2/man/wlags49.4 | 2 +-
3415 drivers/staging/xgifb/TODO | 2 +-
3416 drivers/staging/xgifb/vb_setmode.c | 4 +-
3417 drivers/staging/zram/zram_drv.h | 4 +-
3418 drivers/vme/boards/vme_vmivme7805.c | 15 +-
3419 drivers/vme/bridges/vme_ca91cx42.c | 15 +-
3420 drivers/vme/bridges/vme_tsi148.c | 15 +-
3421 include/linux/iio/types.h | 1 +
3422 include/linux/platform_data/ad5449.h | 40 +
3423 307 files changed, 6427 insertions(+), 5956 deletions(-)
3424 create mode 100644 drivers/iio/dac/ad5449.c
3425 create mode 100644 drivers/staging/android/binder_trace.h
3426 delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
3427 delete mode 100644 drivers/staging/ipack/bridges/Kconfig
3428 create mode 100644 drivers/staging/ipack/carriers/Kconfig
3429 rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%)
3430 rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%)
3431 rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%)
3432 create mode 100644 include/linux/platform_data/ad5449.h
3433 Merging char-misc/char-misc-next (dbfd5cc w1/ds2482: use module_i2c_driver to simplify the code)
3434 $ git merge char-misc/char-misc-next
3435 Auto-merging drivers/hv/channel.c
3436 Merge made by the 'recursive' strategy.
3437 Documentation/DocBook/uio-howto.tmpl | 56 ++++
3438 arch/arm/include/asm/io.h | 2 +-
3439 arch/arm/mm/mmap.c | 2 +-
3440 arch/ia64/include/asm/io.h | 2 +-
3441 arch/ia64/kernel/efi.c | 2 +-
3442 arch/sh/include/asm/io.h | 2 +-
3443 arch/sh/mm/mmap.c | 2 +-
3444 drivers/char/mem.c | 10 +-
3445 drivers/char/pc8736x_gpio.c | 3 +-
3446 drivers/hv/channel.c | 8 -
3447 drivers/hv/channel_mgmt.c | 8 -
3448 drivers/misc/mei/init.c | 37 +--
3449 drivers/misc/mei/interrupt.c | 189 ++++++-------
3450 drivers/misc/mei/iorw.c | 197 +++++++++-----
3451 drivers/misc/mei/main.c | 186 +++++--------
3452 drivers/misc/mei/mei_dev.h | 43 +--
3453 drivers/misc/ti-st/st_core.c | 1 -
3454 drivers/uio/Kconfig | 16 ++
3455 drivers/uio/Makefile | 1 +
3456 drivers/uio/uio_dmem_genirq.c | 354 +++++++++++++++++++++++++
3457 drivers/w1/masters/Kconfig | 2 +-
3458 drivers/w1/masters/ds2482.c | 13 +-
3459 include/linux/platform_data/uio_dmem_genirq.h | 26 ++
3460 23 files changed, 785 insertions(+), 377 deletions(-)
3461 create mode 100644 drivers/uio/uio_dmem_genirq.c
3462 create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
3463 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
3464 $ git merge tmem/linux-next
3465 Auto-merging include/xen/xen.h
3466 Auto-merging include/xen/interface/xen.h
3467 Auto-merging arch/x86/xen/smp.c
3468 Auto-merging arch/x86/xen/setup.c
3469 Auto-merging arch/x86/include/asm/xen/page.h
3470 Auto-merging arch/x86/include/asm/xen/interface.h
3471 Merge made by the 'recursive' strategy.
3472 arch/x86/include/asm/xen/interface.h | 3 ++-
3473 arch/x86/include/asm/xen/page.h | 3 +++
3474 arch/x86/xen/setup.c | 13 +++++++++---
3475 arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
3476 drivers/xen/cpu_hotplug.c | 3 ++-
3477 include/xen/interface/xen.h | 1 +
3478 include/xen/xen.h | 4 ++++
3479 7 files changed, 43 insertions(+), 23 deletions(-)
3480 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
3481 $ git merge writeback/writeback-for-next
3483 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
3484 $ git merge arm-dt/devicetree/arm-next
3486 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
3487 $ git merge hwspinlock/linux-next
3489 Merging pinctrl/for-next (23d0f98 Merge branch 'u300' into for-next)
3490 $ git merge pinctrl/for-next
3491 Auto-merging include/linux/platform_data/pinctrl-nomadik.h
3492 Auto-merging drivers/pinctrl/mvebu/pinctrl-mvebu.c
3493 Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
3494 Auto-merging arch/arm/mach-u300/core.c
3495 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
3496 Auto-merging arch/arm/boot/dts/Makefile
3497 Auto-merging arch/arm/Kconfig
3498 Merge made by the 'recursive' strategy.
3499 .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +
3500 .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++
3501 .../bindings/pinctrl/samsung-pinctrl.txt | 118 +-
3502 Documentation/pinctrl.txt | 4 +-
3503 arch/arm/Kconfig | 2 +
3504 arch/arm/boot/dts/Makefile | 44 +-
3505 arch/arm/boot/dts/at91sam9260.dtsi | 187 ++-
3506 arch/arm/boot/dts/at91sam9263.dtsi | 173 ++-
3507 arch/arm/boot/dts/at91sam9263ek.dts | 1 +
3508 arch/arm/boot/dts/at91sam9g15.dtsi | 28 +
3509 arch/arm/boot/dts/at91sam9g15ek.dts | 16 +
3510 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 +
3511 arch/arm/boot/dts/at91sam9g25.dtsi | 28 +
3512 arch/arm/boot/dts/at91sam9g25ek.dts | 49 +-
3513 arch/arm/boot/dts/at91sam9g35.dtsi | 28 +
3514 arch/arm/boot/dts/at91sam9g35ek.dts | 16 +
3515 arch/arm/boot/dts/at91sam9g45.dtsi | 189 ++-
3516 arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 +
3517 arch/arm/boot/dts/at91sam9n12.dtsi | 180 ++-
3518 arch/arm/boot/dts/at91sam9x25.dtsi | 28 +
3519 arch/arm/boot/dts/at91sam9x25ek.dts | 16 +
3520 arch/arm/boot/dts/at91sam9x35.dtsi | 28 +
3521 arch/arm/boot/dts/at91sam9x35ek.dts | 16 +
3522 arch/arm/boot/dts/at91sam9x5.dtsi | 178 ++-
3523 arch/arm/boot/dts/at91sam9x5ek.dtsi | 59 +
3524 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 278 ++++
3525 arch/arm/boot/dts/exynos4210.dtsi | 241 +---
3526 arch/arm/configs/at91_dt_defconfig | 1 +
3527 arch/arm/mach-at91/at91rm9200.c | 4 +-
3528 arch/arm/mach-at91/at91sam9260.c | 7 +-
3529 arch/arm/mach-at91/at91sam9261.c | 4 +-
3530 arch/arm/mach-at91/at91sam9263.c | 9 +-
3531 arch/arm/mach-at91/at91sam9g45.c | 10 +-
3532 arch/arm/mach-at91/at91sam9n12.c | 15 +-
3533 arch/arm/mach-at91/at91sam9rl.c | 4 +-
3534 arch/arm/mach-at91/at91sam9x5.c | 19 +-
3535 arch/arm/mach-at91/board-dt.c | 2 -
3536 arch/arm/mach-at91/gpio.c | 190 +--
3537 arch/arm/mach-at91/setup.c | 6 +-
3538 arch/arm/mach-at91/soc.h | 12 +-
3539 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
3540 arch/arm/mach-nomadik/cpu-8815.c | 2 +-
3541 arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +-
3542 arch/arm/mach-u300/core.c | 3 +-
3543 arch/arm/mach-u300/include/mach/irqs.h | 126 +-
3544 arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
3545 arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
3546 arch/arm/mach-ux500/board-mop500.c | 2 +-
3547 arch/arm/mach-ux500/cpu-db8500.c | 4 +-
3548 arch/arm/mach-ux500/devices-common.c | 3 +-
3549 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 102 --
3550 drivers/mtd/nand/atmel_nand.c | 9 +
3551 drivers/pinctrl/Kconfig | 31 +-
3552 drivers/pinctrl/Makefile | 7 +-
3553 drivers/pinctrl/core.c | 2 +
3554 drivers/pinctrl/core.h | 2 +
3555 drivers/pinctrl/mvebu/Kconfig | 24 +
3556 drivers/pinctrl/mvebu/Makefile | 5 +
3557 drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c | 0
3558 drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c | 0
3559 drivers/pinctrl/{ => mvebu}/pinctrl-dove.c | 0
3560 drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c | 0
3561 drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c | 1 -
3562 drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h | 0
3563 drivers/pinctrl/pinctrl-at91.c | 1514 ++++++++++++++++++++
3564 drivers/pinctrl/pinctrl-coh901.c | 122 +-
3565 drivers/pinctrl/pinctrl-exynos.c | 367 +++--
3566 drivers/pinctrl/pinctrl-exynos.h | 170 +--
3567 drivers/pinctrl/pinctrl-nomadik-db8500.c | 101 +-
3568 drivers/pinctrl/pinctrl-nomadik.c | 57 +-
3569 drivers/pinctrl/pinctrl-nomadik.h | 2 +-
3570 drivers/pinctrl/pinctrl-samsung.c | 203 ++-
3571 drivers/pinctrl/pinctrl-samsung.h | 29 +-
3572 drivers/pinctrl/pinctrl-u300.c | 32 +-
3573 drivers/pinctrl/pinmux.c | 67 +-
3574 drivers/tty/serial/atmel_serial.c | 8 +
3575 include/linux/platform_data/pinctrl-coh901.h | 2 -
3576 .../linux/platform_data/pinctrl-nomadik.h | 111 +-
3577 78 files changed, 3974 insertions(+), 1484 deletions(-)
3578 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
3579 create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
3580 create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
3581 create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
3582 create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
3583 create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
3584 create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
3585 create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
3586 create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
3587 create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
3588 create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
3589 delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
3590 create mode 100644 drivers/pinctrl/mvebu/Kconfig
3591 create mode 100644 drivers/pinctrl/mvebu/Makefile
3592 rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%)
3593 rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%)
3594 rename drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%)
3595 rename drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%)
3596 rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (99%)
3597 rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%)
3598 create mode 100644 drivers/pinctrl/pinctrl-at91.c
3599 rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
3600 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
3601 $ git merge vhost/linux-next
3602 Resolved 'drivers/net/tun.c' using previous resolution.
3603 Auto-merging drivers/net/tun.c
3604 CONFLICT (content): Merge conflict in drivers/net/tun.c
3605 Automatic merge failed; fix conflicts and then commit the result.
3607 [master 3d8822a] Merge remote-tracking branch 'vhost/linux-next'
3608 $ git diff -M --stat --summary HEAD^..
3609 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
3610 $ git merge memblock/memblock-kill-early_node_map
3612 Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
3613 $ git merge remoteproc/for-next
3615 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
3616 $ git merge irqdomain/irqdomain/next
3618 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
3619 $ git merge gpio/gpio/next
3621 Merging gpio-lw/for-next (cc46f74 Merge branch 'devel' into for-next)
3622 $ git merge gpio-lw/for-next
3623 Auto-merging drivers/gpio/gpio-mvebu.c
3624 Auto-merging arch/arm/Kconfig
3625 Merge made by the 'recursive' strategy.
3626 arch/arm/Kconfig | 1 +
3627 drivers/gpio/Kconfig | 15 +++
3628 drivers/gpio/Makefile | 2 +
3629 drivers/gpio/gpio-74x164.c | 2 +-
3630 drivers/gpio/gpio-clps711x.c | 163 ++++++++++++++++++++++++++++++++
3631 drivers/gpio/gpio-da9055.c | 204 ++++++++++++++++++++++++++++++++++++++++
3632 drivers/gpio/gpio-mvebu.c | 2 +
3633 drivers/gpio/gpio-omap.c | 3 +-
3634 drivers/gpio/gpio-pl061.c | 59 +++++-------
3635 drivers/gpio/gpio-timberdale.c | 4 +-
3636 drivers/gpio/gpio-vt8500.c | 2 +
3637 drivers/gpio/gpiolib.c | 85 +++++++++--------
3638 12 files changed, 462 insertions(+), 80 deletions(-)
3639 create mode 100644 drivers/gpio/gpio-clps711x.c
3640 create mode 100644 drivers/gpio/gpio-da9055.c
3641 Merging arm-soc/for-next (430f54f Merge branch 'next/soc' into for-next)
3642 $ git merge arm-soc/for-next
3643 Auto-merging include/linux/dma/ipu-dma.h
3644 Removing arch/arm/plat-mxc/include/mach/uncompress.h
3645 Removing arch/arm/plat-mxc/include/mach/timex.h
3646 Removing arch/arm/plat-mxc/include/mach/irqs.h
3647 Removing arch/arm/plat-mxc/Makefile
3648 Removing arch/arm/plat-mxc/Kconfig
3649 Removing arch/arm/mach-vt8500/include/mach/restart.h
3650 Removing arch/arm/mach-vt8500/include/mach/i8042.h
3651 Removing arch/arm/mach-vt8500/include/mach/hardware.h
3652 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
3653 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
3654 Auto-merging arch/arm/mach-ux500/board-mop500.c
3655 Removing arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
3656 Removing arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
3657 Auto-merging arch/arm/mach-imx/ulpi.c
3658 Auto-merging arch/arm/mach-imx/tzic.c
3659 Auto-merging arch/arm/mach-imx/time.c
3660 Auto-merging arch/arm/mach-imx/system.c
3661 Auto-merging arch/arm/mach-imx/irq-common.h
3662 Auto-merging arch/arm/mach-imx/iram_alloc.c
3663 Auto-merging arch/arm/mach-imx/iomux-v3.c
3664 Auto-merging arch/arm/mach-imx/iomux-v1.c
3665 Auto-merging arch/arm/mach-imx/iomux-mx51.h
3666 Auto-merging arch/arm/mach-imx/iomux-mx50.h
3667 Auto-merging arch/arm/mach-imx/iomux-mx35.h
3668 Auto-merging arch/arm/mach-imx/iomux-mx27.h
3669 Auto-merging arch/arm/mach-imx/iomux-mx25.h
3670 Auto-merging arch/arm/mach-imx/iomux-mx21.h
3671 Auto-merging arch/arm/mach-imx/iomux-mx1.h
3672 Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
3673 Auto-merging arch/arm/mach-imx/hardware.h
3674 Auto-merging arch/arm/mach-imx/epit.c
3675 Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
3676 Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
3677 Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
3678 Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
3679 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
3680 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
3681 Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
3682 Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
3683 Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
3684 Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
3685 Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
3686 Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
3687 Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
3688 Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
3689 Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
3690 Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
3691 Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
3692 Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
3693 Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
3694 Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
3695 Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
3696 Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
3697 Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
3698 Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
3699 Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
3700 Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c
3701 Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
3702 Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
3703 Auto-merging arch/arm/mach-imx/devices/platform-fec.c
3704 Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
3705 Auto-merging arch/arm/mach-imx/devices/devices.c
3706 Auto-merging arch/arm/mach-imx/devices/devices-common.h
3707 Auto-merging arch/arm/mach-imx/devices/Makefile
3708 Auto-merging arch/arm/mach-imx/cpufreq.c
3709 Auto-merging arch/arm/mach-imx/cpu.c
3710 Auto-merging arch/arm/mach-imx/common.h
3711 Auto-merging arch/arm/mach-imx/avic.c
3712 Auto-merging arch/arm/mach-imx/3ds_debugboard.c
3713 Auto-merging arch/arm/mach-clps711x/edb7211.c
3714 Removing arch/arm/mach-clps711x/edb7211-mm.c
3715 Auto-merging arch/arm/mach-at91/setup.c
3716 Auto-merging arch/arm/mach-at91/at91sam9263.c
3717 Auto-merging arch/arm/mach-at91/at91sam9261.c
3718 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
3719 Auto-merging arch/arm/mach-at91/at91sam9260.c
3720 Auto-merging arch/arm/mach-at91/at91rm9200.c
3721 Auto-merging arch/arm/mach-at91/Kconfig
3722 Auto-merging arch/arm/include/debug/imx.S
3723 Removing arch/arm/configs/forRecorded preimage for 'arch/arm/Kconfig'
3724 Recorded preimage for 'arch/arm/mach-ux500/cpu-db8500.c'
3726 Removing arch/arm/configs/edb7211_defconfig
3727 Auto-merging arch/arm/boot/dts/at91sam9g20ek_common.dtsi
3728 Removing arch/arm/boot/compressed/head-vt8500.S
3729 Auto-merging arch/arm/Makefile
3730 Auto-merging arch/arm/Kconfig
3731 CONFLICT (content): Merge conflict in arch/arm/Kconfig
3732 Auto-merging MAINTAINERS
3733 Automatic merge failed; fix conflicts and then commit the result.
3735 Recorded resolution for 'arch/arm/Kconfig'.
3736 Recorded resolution for 'arch/arm/mach-ux500/cpu-db8500.c'.
3737 [master c49cd4a] Merge remote-tracking branch 'arm-soc/for-next'
3738 $ git diff -M --stat --summary HEAD^..
3739 .../bindings/arm/altera/socfpga-reset.txt | 11 ++
3740 .../bindings/arm/altera/socfpga-system.txt | 11 ++
3741 .../devicetree/bindings/arm/atmel-at91.txt | 2 +-
3742 .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +-
3744 arch/arm/Kconfig | 17 +--
3745 arch/arm/Kconfig.debug | 8 ++
3746 arch/arm/Makefile | 1 -
3747 arch/arm/arm-soc-for-next-contents.txt | 15 +++
3748 arch/arm/boot/compressed/Makefile | 4 -
3749 arch/arm/boot/compressed/head-vt8500.S | 46 -------
3750 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 +-
3751 arch/arm/boot/dts/dbx5x0.dtsi | 17 ++-
3752 arch/arm/boot/dts/imx23.dtsi | 1 +
3753 arch/arm/boot/dts/imx27.dtsi | 4 +-
3754 arch/arm/boot/dts/imx28.dtsi | 1 +
3755 arch/arm/boot/dts/imx51.dtsi | 4 +-
3756 arch/arm/boot/dts/imx53.dtsi | 6 +-
3757 arch/arm/boot/dts/imx6q.dtsi | 6 +-
3758 arch/arm/boot/dts/omap3.dtsi | 4 +-
3759 arch/arm/boot/dts/socfpga.dtsi | 10 ++
3760 arch/arm/configs/clps711x_defconfig | 78 +++++++++++
3761 arch/arm/configs/edb7211_defconfig | 27 ----
3762 arch/arm/configs/fortunet_defconfig | 28 ----
3763 arch/arm/configs/imx_v4_v5_defconfig | 4 +-
3764 arch/arm/configs/imx_v6_v7_defconfig | 4 +
3765 arch/arm/configs/socfpga_defconfig | 9 +-
3766 arch/arm/include/debug/8250_32.S | 27 ++++
3767 .../mach/debug-macro.S => include/debug/imx.S} | 33 +++--
3768 arch/arm/include/debug/picoxcell.S | 18 +--
3769 arch/arm/include/debug/socfpga.S | 5 +
3770 arch/arm/include/debug/vexpress.S | 10 +-
3771 arch/arm/mach-at91/Kconfig | 10 +-
3772 arch/arm/mach-at91/at91rm9200.c | 2 +-
3773 arch/arm/mach-at91/at91rm9200_devices.c | 4 +-
3774 arch/arm/mach-at91/at91sam9260.c | 4 +-
3775 arch/arm/mach-at91/at91sam9260_devices.c | 4 +-
3776 arch/arm/mach-at91/at91sam9261.c | 4 +-
3777 arch/arm/mach-at91/at91sam9261_devices.c | 4 +-
3778 arch/arm/mach-at91/at91sam9263.c | 2 +-
3779 arch/arm/mach-at91/at91sam9263_devices.c | 4 +-
3780 arch/arm/mach-at91/at91sam9rl_devices.c | 4 +-
3781 arch/arm/mach-at91/board-neocore926.c | 2 +-
3782 arch/arm/mach-at91/board-sam9261ek.c | 2 +-
3783 arch/arm/mach-at91/board-sam9263ek.c | 2 +-
3784 arch/arm/mach-at91/generic.h | 3 +-
3785 arch/arm/mach-at91/irq.c | 9 +-
3786 arch/arm/mach-at91/setup.c | 4 +-
3787 arch/arm/mach-clps711x/Makefile | 2 +-
3788 arch/arm/mach-clps711x/autcpu12.c | 15 +--
3789 arch/arm/mach-clps711x/cdb89712.c | 4 +-
3790 arch/arm/mach-clps711x/common.c | 113 ++++++++++------
3791 arch/arm/mach-clps711x/edb7211-mm.c | 82 ------------
3792 .../mach-clps711x/{edb7211-arch.c => edb7211.c} | 58 ++++++---
3793 arch/arm/mach-clps711x/include/mach/autcpu12.h | 14 +-
3794 arch/arm/mach-clps711x/include/mach/clps711x.h | 3 +
3795 arch/arm/mach-clps711x/include/mach/hardware.h | 56 ++------
3796 arch/arm/mach-clps711x/include/mach/irqs.h | 4 -
3797 arch/arm/mach-clps711x/include/mach/syspld.h | 9 +-
3798 arch/arm/mach-clps711x/p720t.c | 18 +--
3799 arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +-
3800 .../include/mach => mach-imx}/3ds_debugboard.h | 0
3801 arch/arm/mach-imx/Kconfig | 90 ++++++++++++-
3802 arch/arm/mach-imx/Makefile | 22 ++++
3803 arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +-
3804 .../include/mach => mach-imx}/board-mx31lilly.h | 0
3805 .../include/mach => mach-imx}/board-mx31lite.h | 0
3806 .../include/mach => mach-imx}/board-mx31moboard.h | 0
3807 .../include/mach => mach-imx}/board-pcm038.h | 0
3808 arch/arm/mach-imx/clk-busy.c | 2 +-
3809 arch/arm/mach-imx/clk-imx1.c | 17 +--
3810 arch/arm/mach-imx/clk-imx21.c | 18 +--
3811 arch/arm/mach-imx/clk-imx25.c | 38 +++---
3812 arch/arm/mach-imx/clk-imx27.c | 44 +++----
3813 arch/arm/mach-imx/clk-imx31.c | 21 ++-
3814 arch/arm/mach-imx/clk-imx35.c | 13 +-
3815 arch/arm/mach-imx/clk-imx51-imx53.c | 15 +--
3816 arch/arm/mach-imx/clk-imx6q.c | 3 +-
3817 arch/arm/mach-imx/clk-pllv1.c | 4 +-
3818 .../{plat-mxc/include/mach => mach-imx}/common.h | 1 +
3819 arch/arm/mach-imx/cpu-imx25.c | 5 +-
3820 arch/arm/mach-imx/cpu-imx27.c | 2 +-
3821 arch/arm/mach-imx/cpu-imx31.c | 7 +-
3822 arch/arm/mach-imx/cpu-imx35.c | 5 +-
3823 arch/arm/mach-imx/cpu-imx5.c | 3 +-
3824 arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +-
3825 arch/arm/mach-imx/cpu_op-mx51.c | 3 +-
3826 arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +-
3827 arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0
3828 .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0
3829 arch/arm/mach-imx/devices-imx1.h | 3 +-
3830 arch/arm/mach-imx/devices-imx21.h | 3 +-
3831 arch/arm/mach-imx/devices-imx25.h | 3 +-
3832 arch/arm/mach-imx/devices-imx27.h | 3 +-
3833 arch/arm/mach-imx/devices-imx31.h | 3 +-
3834 arch/arm/mach-imx/devices-imx35.h | 3 +-
3835 arch/arm/mach-imx/devices-imx50.h | 3 +-
3836 arch/arm/mach-imx/devices-imx51.h | 3 +-
3837 arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 0
3838 arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 2 +
3839 .../mach => mach-imx/devices}/devices-common.h | 9 +-
3840 arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 4 +-
3841 .../devices/platform-ahci-imx.c | 5 +-
3842 .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +-
3843 .../devices/platform-flexcan.c | 4 +-
3844 .../devices/platform-fsl-usb2-udc.c | 5 +-
3845 .../devices/platform-gpio-mxc.c | 2 +-
3846 .../devices/platform-gpio_keys.c | 5 +-
3847 .../devices/platform-imx-dma.c | 23 +++-
3848 .../devices/platform-imx-fb.c | 16 ++-
3849 .../devices/platform-imx-i2c.c | 32 ++---
3850 .../devices/platform-imx-keypad.c | 4 +-
3851 .../devices/platform-imx-ssi.c | 4 +-
3852 .../devices/platform-imx-uart.c | 4 +-
3853 .../devices/platform-imx2-wdt.c | 5 +-
3854 .../devices/platform-imx21-hcd.c | 4 +-
3855 .../devices/platform-imx27-coda.c | 4 +-
3856 .../devices/platform-imx_udc.c | 4 +-
3857 .../devices/platform-imxdi_rtc.c | 5 +-
3858 .../devices/platform-ipu-core.c | 5 +-
3859 .../devices/platform-mx1-camera.c | 4 +-
3860 .../devices/platform-mx2-camera.c | 16 ++-
3861 .../devices/platform-mxc-ehci.c | 5 +-
3862 .../devices/platform-mxc-mmc.c | 22 ++--
3863 .../devices/platform-mxc_nand.c | 25 ++--
3864 .../devices/platform-mxc_pwm.c | 4 +-
3865 .../devices/platform-mxc_rnga.c | 4 +-
3866 .../devices/platform-mxc_rtc.c | 13 +-
3867 .../devices/platform-mxc_w1.c | 4 +-
3868 .../devices/platform-pata_imx.c | 4 +-
3869 .../devices/platform-sdhci-esdhc-imx.c | 5 +-
3870 .../devices/platform-spi_imx.c | 4 +-
3871 arch/arm/mach-imx/ehci-imx25.c | 4 +-
3872 arch/arm/mach-imx/ehci-imx27.c | 4 +-
3873 arch/arm/mach-imx/ehci-imx31.c | 4 +-
3874 arch/arm/mach-imx/ehci-imx35.c | 4 +-
3875 arch/arm/mach-imx/ehci-imx5.c | 4 +-
3876 arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +-
3877 .../include/mach => mach-imx}/eukrea-baseboards.h | 0
3878 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +-
3879 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +-
3880 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +-
3881 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +-
3882 .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 ++--
3883 arch/arm/mach-imx/hotplug.c | 3 +-
3884 arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0
3885 arch/arm/mach-imx/imx27-dt.c | 11 +-
3886 arch/arm/mach-imx/imx31-dt.c | 5 +-
3887 arch/arm/mach-imx/imx51-dt.c | 9 +-
3888 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 --
3889 arch/arm/mach-imx/iomux-imx31.c | 5 +-
3890 .../include/mach => mach-imx}/iomux-mx1.h | 2 +-
3891 .../include/mach => mach-imx}/iomux-mx21.h | 4 +-
3892 .../include/mach => mach-imx}/iomux-mx25.h | 2 +-
3893 .../include/mach => mach-imx}/iomux-mx27.h | 4 +-
3894 .../include/mach => mach-imx}/iomux-mx2x.h | 0
3895 .../include/mach => mach-imx}/iomux-mx3.h | 0
3896 .../include/mach => mach-imx}/iomux-mx35.h | 2 +-
3897 .../include/mach => mach-imx}/iomux-mx50.h | 2 +-
3898 .../include/mach => mach-imx}/iomux-mx51.h | 2 +-
3899 arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +-
3900 .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0
3901 arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +-
3902 .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0
3903 .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0
3904 arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +-
3905 arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0
3906 arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 +
3907 arch/arm/mach-imx/lluart.c | 3 +-
3908 arch/arm/mach-imx/mach-apf9328.c | 7 +-
3909 arch/arm/mach-imx/mach-armadillo5x0.c | 9 +-
3910 arch/arm/mach-imx/mach-bug.c | 7 +-
3911 arch/arm/mach-imx/mach-cpuimx27.c | 11 +-
3912 arch/arm/mach-imx/mach-cpuimx35.c | 9 +-
3913 arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +-
3914 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +-
3915 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
3916 arch/arm/mach-imx/mach-imx27ipcam.c | 6 +-
3917 arch/arm/mach-imx/mach-imx27lite.c | 6 +-
3918 arch/arm/mach-imx/mach-imx53.c | 11 +-
3919 arch/arm/mach-imx/mach-imx6q.c | 6 +-
3920 arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +-
3921 arch/arm/mach-imx/mach-mx1ads.c | 7 +-
3922 arch/arm/mach-imx/mach-mx21ads.c | 6 +-
3923 arch/arm/mach-imx/mach-mx25_3ds.c | 8 +-
3924 arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
3925 arch/arm/mach-imx/mach-mx27ads.c | 6 +-
3926 arch/arm/mach-imx/mach-mx31_3ds.c | 12 +-
3927 arch/arm/mach-imx/mach-mx31ads.c | 5 +-
3928 arch/arm/mach-imx/mach-mx31lilly.c | 11 +-
3929 arch/arm/mach-imx/mach-mx31lite.c | 11 +-
3930 arch/arm/mach-imx/mach-mx31moboard.c | 14 +-
3931 arch/arm/mach-imx/mach-mx35_3ds.c | 8 +-
3932 arch/arm/mach-imx/mach-mx50_rdp.c | 7 +-
3933 arch/arm/mach-imx/mach-mx51_3ds.c | 9 +-
3934 arch/arm/mach-imx/mach-mx51_babbage.c | 7 +-
3935 arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
3936 arch/arm/mach-imx/mach-pca100.c | 8 +-
3937 arch/arm/mach-imx/mach-pcm037.c | 8 +-
3938 arch/arm/mach-imx/mach-pcm037_eet.c | 5 +-
3939 arch/arm/mach-imx/mach-pcm038.c | 13 +-
3940 arch/arm/mach-imx/mach-pcm043.c | 9 +-
3941 arch/arm/mach-imx/mach-qong.c | 6 +-
3942 arch/arm/mach-imx/mach-scb9328.c | 7 +-
3943 arch/arm/mach-imx/mach-vpr200.c | 7 +-
3944 arch/arm/mach-imx/mm-imx1.c | 9 +-
3945 arch/arm/mach-imx/mm-imx21.c | 14 +-
3946 arch/arm/mach-imx/mm-imx25.c | 12 +-
3947 arch/arm/mach-imx/mm-imx27.c | 14 +-
3948 arch/arm/mach-imx/mm-imx3.c | 18 +--
3949 arch/arm/mach-imx/mm-imx5.c | 12 +-
3950 arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0
3951 .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0
3952 .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0
3953 .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0
3954 .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0
3955 .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0
3956 arch/arm/mach-imx/mx31lilly-db.c | 9 +-
3957 arch/arm/mach-imx/mx31lite-db.c | 9 +-
3958 arch/arm/mach-imx/mx31moboard-devboard.c | 9 +-
3959 arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +-
3960 arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +-
3961 .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0
3962 .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0
3963 .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0
3964 .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0
3965 .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0
3966 .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 0
3967 arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0
3968 arch/arm/mach-imx/pcm970-baseboard.c | 7 +-
3969 arch/arm/mach-imx/platsmp.c | 5 +-
3970 arch/arm/mach-imx/pm-imx27.c | 3 +-
3971 arch/arm/mach-imx/pm-imx3.c | 7 +-
3972 arch/arm/mach-imx/pm-imx5.c | 7 +-
3973 arch/arm/mach-imx/pm-imx6q.c | 5 +-
3974 arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0
3975 arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0
3976 arch/arm/{plat-mxc => mach-imx}/system.c | 5 +-
3977 arch/arm/{plat-mxc => mach-imx}/time.c | 5 +-
3978 arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +-
3979 arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +-
3980 .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0
3981 arch/arm/mach-omap2/Kconfig | 1 -
3982 arch/arm/mach-omap2/board-omap3beagle.c | 22 ++--
3983 arch/arm/mach-omap2/clock33xx_data.c | 2 +
3984 arch/arm/mach-omap2/mux34xx.c | 8 +-
3985 arch/arm/mach-omap2/pm.h | 1 +
3986 arch/arm/mach-omap2/pm34xx.c | 30 ++++-
3987 arch/arm/mach-omap2/serial.c | 5 +
3988 arch/arm/mach-socfpga/Kconfig | 1 +
3989 arch/arm/mach-socfpga/Makefile | 1 +
3990 arch/arm/mach-socfpga/core.h | 34 +++++
3991 arch/arm/mach-socfpga/headsmp.S | 24 ++++
3992 arch/arm/mach-socfpga/platsmp.c | 117 +++++++++++++++++
3993 arch/arm/mach-socfpga/socfpga.c | 45 ++++++-
3994 arch/arm/mach-ux500/board-mop500.c | 13 +-
3995 arch/arm/mach-ux500/cpu-db8500.c | 3 +
3996 arch/arm/mach-ux500/cpu.c | 1 +
3997 arch/arm/mach-vt8500/include/mach/hardware.h | 12 --
3998 arch/arm/mach-vt8500/include/mach/i8042.h | 18 ---
3999 arch/arm/mach-vt8500/include/mach/restart.h | 17 ---
4000 arch/arm/mach-vt8500/timer.c | 2 +-
4001 arch/arm/mach-vt8500/vt8500.c | 2 -
4002 arch/arm/plat-mxc/Kconfig | 89 -------------
4003 arch/arm/plat-mxc/Makefile | 24 ----
4004 arch/arm/plat-mxc/include/mach/irqs.h | 21 ---
4005 arch/arm/plat-mxc/include/mach/timex.h | 22 ----
4006 arch/arm/plat-mxc/include/mach/uncompress.h | 132 -------------------
4007 arch/arm/plat-omap/Kconfig | 1 +
4008 drivers/dma/imx-dma.c | 137 ++++++++++++--------
4009 drivers/dma/imx-sdma.c | 1 -
4010 drivers/dma/ipu/ipu_idmac.c | 3 +-
4011 drivers/dma/ipu/ipu_irq.c | 3 +-
4012 drivers/i2c/busses/i2c-imx.c | 40 +++++-
4013 drivers/media/platform/soc_camera/mx2_camera.c | 95 ++++++++++----
4014 drivers/media/platform/soc_camera/mx3_camera.c | 2 +-
4015 drivers/mmc/host/mxcmmc.c | 31 ++++-
4016 drivers/mtd/nand/mxc_nand.c | 96 +++++++++-----
4017 drivers/rtc/rtc-mxc.c | 34 ++++-
4018 drivers/usb/host/ehci-mxc.c | 1 -
4019 drivers/video/imxfb.c | 38 +++++-
4020 drivers/video/mx3fb.c | 3 +-
4021 drivers/watchdog/imx2_wdt.c | 1 -
4022 .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +-
4023 include/linux/platform_data/asoc-imx-ssi.h | 2 +
4024 include/linux/platform_data/dma-imx.h | 4 +-
4025 sound/soc/fsl/imx-pcm-fiq.c | 1 -
4026 sound/soc/fsl/imx-ssi.c | 1 -
4027 288 files changed, 1765 insertions(+), 1495 deletions(-)
4028 create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt
4029 create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
4030 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
4031 delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
4032 create mode 100644 arch/arm/configs/clps711x_defconfig
4033 delete mode 100644 arch/arm/configs/edb7211_defconfig
4034 delete mode 100644 arch/arm/configs/fortunet_defconfig
4035 create mode 100644 arch/arm/include/debug/8250_32.S
4036 rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%)
4037 delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c
4038 rename arch/arm/mach-clps711x/{edb7211-arch.c => edb7211.c} (56%)
4039 rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
4040 rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
4041 rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
4042 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
4043 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
4044 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
4045 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
4046 rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%)
4047 rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
4048 rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
4049 rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
4050 rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
4051 rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%)
4052 rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%)
4053 rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%)
4054 rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
4055 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
4056 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
4057 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
4058 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
4059 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
4060 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
4061 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
4062 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
4063 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
4064 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
4065 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
4066 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
4067 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
4068 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
4069 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
4070 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
4071 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
4072 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
4073 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
4074 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%)
4075 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
4076 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (74%)
4077 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
4078 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
4079 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
4080 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
4081 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
4082 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
4083 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
4084 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
4085 rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
4086 rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
4087 rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
4088 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
4089 delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
4090 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
4091 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
4092 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
4093 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
4094 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
4095 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
4096 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
4097 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
4098 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
4099 rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
4100 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
4101 rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
4102 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
4103 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
4104 rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
4105 rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
4106 rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
4107 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
4108 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
4109 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
4110 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
4111 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
4112 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
4113 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
4114 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
4115 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
4116 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
4117 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
4118 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%)
4119 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
4120 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
4121 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
4122 rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
4123 rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
4124 rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
4125 rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
4126 rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
4127 create mode 100644 arch/arm/mach-socfpga/core.h
4128 create mode 100644 arch/arm/mach-socfpga/headsmp.S
4129 create mode 100644 arch/arm/mach-socfpga/platsmp.c
4130 delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
4131 delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
4132 delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
4133 delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
4134 delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
4135 delete mode 100644 arch/arm/plat-mxc/Kconfig
4136 delete mode 100644 arch/arm/plat-mxc/Makefile
4137 delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
4138 delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h
4139 delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
4140 rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
4141 Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
4142 $ git merge cortex/for-next
4143 Auto-merging arch/arm/mm/alignment.c
4144 Auto-merging arch/arm/kernel/process.c
4145 Merge made by the 'recursive' strategy.
4146 arch/arm/include/asm/assembler.h | 13 ++-
4147 arch/arm/include/asm/cp15.h | 11 ++-
4148 arch/arm/include/asm/cputype.h | 3 +
4149 arch/arm/include/asm/glue-cache.h | 25 ++++++
4150 arch/arm/include/asm/glue-df.h | 8 ++
4151 arch/arm/include/asm/glue-proc.h | 9 ++
4152 arch/arm/include/asm/irqflags.h | 22 +++--
4153 arch/arm/include/asm/processor.h | 7 ++
4154 arch/arm/include/asm/ptrace.h | 8 ++
4155 arch/arm/include/asm/system_info.h | 1 +
4156 arch/arm/include/uapi/asm/ptrace.h | 36 ++++++--
4157 arch/arm/kernel/asm-offsets.c | 3 +
4158 arch/arm/kernel/entry-common.S | 4 +
4159 arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++
4160 arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++
4161 arch/arm/kernel/head-common.S | 9 +-
4162 arch/arm/kernel/head-nommu.S | 9 +-
4163 arch/arm/kernel/process.c | 4 +
4164 arch/arm/kernel/ptrace.c | 3 +
4165 arch/arm/kernel/setup.c | 13 ++-
4166 arch/arm/kernel/traps.c | 2 +
4167 arch/arm/mm/alignment.c | 2 +
4168 arch/arm/mm/mmu.c | 17 ++++
4169 arch/arm/mm/nommu.c | 2 +
4170 arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++
4171 25 files changed, 632 insertions(+), 22 deletions(-)
4172 create mode 100644 arch/arm/kernel/entry-v7m.S
4173 create mode 100644 arch/arm/mm/proc-v7m.S
4174 Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
4175 $ git merge ep93xx/ep93xx-for-next
4177 Merge made by the 'recursive' strategy.
4178 Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
4179 $ git merge ixp4xx/next
4180 Merge made by the 'recursive' strategy.
4181 arch/arm/mach-ixp4xx/common-pci.c | 1 +
4182 arch/arm/mach-ixp4xx/common.c | 13 +++----
4183 arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
4184 arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
4185 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
4186 arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
4187 arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
4188 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +-----
4189 drivers/char/hw_random/Kconfig | 6 +--
4190 drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
4191 drivers/crypto/Kconfig | 2 +-
4192 drivers/crypto/ixp4xx_crypto.c | 12 +++---
4193 drivers/net/wan/ixp4xx_hss.c | 2 +-
4194 13 files changed, 59 insertions(+), 68 deletions(-)
4195 Merging msm/for-next (a0d271c Linux 3.6)
4196 $ git merge msm/for-next
4198 Merging renesas/next (33e6bc3 Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/boards' into next)
4199 $ git merge renesas/next
4200 Auto-merging arch/arm/boot/dts/Makefile
4201 Merge made by the 'recursive' strategy.
4202 arch/arm/boot/dts/Makefile | 3 +-
4203 arch/arm/boot/dts/sh7372-mackerel.dts | 22 +++++++
4204 arch/arm/configs/armadillo800eva_defconfig | 3 +-
4205 arch/arm/configs/kzm9g_defconfig | 4 ++
4206 arch/arm/configs/mackerel_defconfig | 18 +++++-
4207 arch/arm/configs/marzen_defconfig | 4 ++
4208 arch/arm/mach-shmobile/Kconfig | 1 +
4209 arch/arm/mach-shmobile/board-armadillo800eva.c | 8 +++
4210 arch/arm/mach-shmobile/board-kzm9g.c | 14 ++++-
4211 arch/arm/mach-shmobile/board-mackerel.c | 8 ++-
4212 arch/arm/mach-shmobile/board-marzen.c | 25 ++++++++
4213 arch/arm/mach-shmobile/clock-r8a7779.c | 16 ++++-
4214 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++
4215 arch/arm/mach-shmobile/setup-r8a7740.c | 18 +++++-
4216 arch/arm/mach-shmobile/setup-r8a7779.c | 79 +++++++++++++++++++++++-
4217 arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++
4218 16 files changed, 238 insertions(+), 9 deletions(-)
4219 create mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts
4220 Merging samsung/for-next (f1d782f Merge branch 'next/board-samsung' into for-next)
4221 $ git merge samsung/for-next
4222 Merge made by the 'recursive' strategy.
4223 .../devicetree/bindings/media/s5p-mfc.txt | 23 ++++
4224 arch/arm/boot/dts/exynos4210-origen.dts | 16 +++
4225 arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +++
4226 arch/arm/boot/dts/exynos4210-trats.dts | 6 +-
4227 arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +
4228 arch/arm/boot/dts/exynos5250.dtsi | 6 +
4229 arch/arm/mach-exynos/Kconfig | 1 +
4230 arch/arm/mach-exynos/clock-exynos4.c | 5 -
4231 arch/arm/mach-exynos/clock-exynos5.c | 7 +-
4232 arch/arm/mach-exynos/common.c | 5 +
4233 arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
4234 arch/arm/mach-exynos/mach-exynos5-dt.c | 16 +++
4235 arch/arm/mach-exynos/mach-nuri.c | 1 -
4236 arch/arm/mach-exynos/mach-universal_c210.c | 1 -
4237 arch/arm/mach-s3c24xx/s3c2416.c | 2 +
4238 arch/arm/mach-s3c24xx/s3c2443.c | 4 +
4239 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 141 ++++++++++++++++----
4240 arch/arm/mach-s3c64xx/mach-crag6410.c | 29 +++-
4241 arch/arm/mach-s5p64x0/common.c | 3 +
4242 arch/arm/mach-s5pc100/common.c | 3 +
4243 arch/arm/mach-s5pv210/common.c | 3 +
4244 arch/arm/mach-s5pv210/mach-goni.c | 1 -
4245 arch/arm/plat-samsung/clock.c | 75 ++++++++++-
4246 arch/arm/plat-samsung/devs.c | 1 +
4247 arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
4248 arch/arm/plat-samsung/include/plat/mfc.h | 11 ++
4249 arch/arm/plat-samsung/include/plat/spi-core.h | 30 +++++
4250 arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +++++
4251 arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
4252 drivers/gpio/gpio-samsung.c | 25 ++--
4253 30 files changed, 427 insertions(+), 54 deletions(-)
4254 create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
4255 create mode 100644 arch/arm/plat-samsung/include/plat/spi-core.h
4256 Merging tegra/for-next (38711a8 Merge branch 'for-3.8/defconfig' into for-next)
4257 $ git merge tegra/for-next
4258 Auto-merging include/linux/tegra-ahb.h
4259 Auto-merging drivers/iommu/tegra-smmu.c
4260 Auto-merging drivers/crypto/tegra-aes.c
4261 Removing arch/arm/mach-tegra/include/mach/irqs.h
4262 Removing arch/arm/mach-tegra/include/mach/dma.h
4263 Auto-merging arch/arm/Kconfig
4264 Merge made by the 'recursive' strategy.
4265 .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 19 ++
4266 .../bindings/timer/nvidia,tegra20-timer.txt | 21 +++
4267 .../bindings/timer/nvidia,tegra30-timer.txt | 23 +++
4268 arch/arm/Kconfig | 1 +
4269 arch/arm/boot/dts/tegra20-harmony.dts | 63 ++-----
4270 arch/arm/boot/dts/tegra20-paz00.dts | 59 ++-----
4271 arch/arm/boot/dts/tegra20-seaboard.dts | 65 +++----
4272 arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 ++-----
4273 arch/arm/boot/dts/tegra20-ventana.dts | 144 ++++++++++------
4274 arch/arm/boot/dts/tegra20-whistler.dts | 119 ++++---------
4275 arch/arm/boot/dts/tegra20.dtsi | 21 +++
4276 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 +
4277 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 +
4278 arch/arm/boot/dts/tegra30-cardhu.dtsi | 74 ++++----
4279 arch/arm/boot/dts/tegra30.dtsi | 23 +++
4280 arch/arm/configs/tegra_defconfig | 1 +
4281 arch/arm/mach-tegra/apbio.c | 3 -
4282 arch/arm/mach-tegra/board-dt-tegra20.c | 5 +-
4283 arch/arm/mach-tegra/board-dt-tegra30.c | 4 +
4284 arch/arm/mach-tegra/clock.c | 2 -
4285 arch/arm/mach-tegra/cpu-tegra.c | 3 -
4286 arch/arm/mach-tegra/cpuidle.c | 44 +----
4287 arch/arm/mach-tegra/include/mach/dma.h | 54 ------
4288 arch/arm/mach-tegra/include/mach/irqs.h | 182 --------------------
4289 arch/arm/mach-tegra/include/mach/powergate.h | 2 +
4290 arch/arm/mach-tegra/pcie.c | 3 +
4291 arch/arm/mach-tegra/platsmp.c | 1 -
4292 arch/arm/mach-tegra/sleep-t20.S | 2 -
4293 arch/arm/mach-tegra/sleep-t30.S | 2 -
4294 arch/arm/mach-tegra/tegra20_clocks_data.c | 2 -
4295 arch/arm/mach-tegra/tegra2_emc.c | 2 -
4296 arch/arm/mach-tegra/timer.c | 40 +++--
4297 drivers/amba/tegra-ahb.c | 1 +
4298 drivers/crypto/tegra-aes.c | 2 -
4299 drivers/iommu/tegra-smmu.c | 4 +-
4300 drivers/staging/nvec/nvec.c | 1 -
4301 .../include/mach => include/linux}/tegra-ahb.h | 6 +-
4302 sound/soc/tegra/tegra30_ahub.c | 1 -
4303 sound/soc/tegra/tegra_pcm.h | 2 -
4304 39 files changed, 389 insertions(+), 687 deletions(-)
4305 create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
4306 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
4307 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
4308 delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
4309 delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
4310 rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
4311 Merging kvmtool/master (54848c1 kvm tools: specify the amount to balloon is in MB)
4312 $ git merge kvmtool/master
4313 Merge made by the 'recursive' strategy.
4314 tools/kvm/Makefile | 3 +++
4315 tools/kvm/builtin-balloon.c | 4 ++--
4316 tools/kvm/builtin-run.c | 17 +++++++++++++++--
4317 tools/kvm/disk/core.c | 2 ++
4318 tools/kvm/hw/serial.c | 10 +++++-----
4319 tools/kvm/include/kvm/kvm.h | 6 ++++++
4320 tools/kvm/include/kvm/mutex.h | 20 +++++++++++++-------
4321 tools/kvm/include/kvm/parse-options.h | 22 +++++++++++-----------
4322 tools/kvm/include/kvm/qcow.h | 2 +-
4323 tools/kvm/include/kvm/threadpool.h | 4 ++--
4324 tools/kvm/include/kvm/uip.h | 10 +++++-----
4325 tools/kvm/ioeventfd.c | 2 ++
4326 tools/kvm/kvm-ipc.c | 2 ++
4327 tools/kvm/net/uip/buf.c | 4 ++--
4328 tools/kvm/net/uip/core.c | 6 +++---
4329 tools/kvm/net/uip/tcp.c | 9 ++++++---
4330 tools/kvm/net/uip/udp.c | 5 ++++-
4331 tools/kvm/pci.c | 4 ++--
4332 tools/kvm/ui/sdl.c | 2 ++
4333 tools/kvm/ui/vnc.c | 2 ++
4334 tools/kvm/util/threadpool.c | 10 ++++++----
4335 tools/kvm/virtio/blk.c | 6 ++++--
4336 tools/kvm/virtio/console.c | 4 ++--
4337 tools/kvm/virtio/net.c | 18 +++++++++++-------
4338 24 files changed, 113 insertions(+), 61 deletions(-)
4339 Merging dma-mapping/dma-mapping-next (4e85fb8 ARM: mm: Remove unused arm_vmregion priv field)
4340 $ git merge dma-mapping/dma-mapping-next
4342 Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
4343 $ git merge pwm/for-next
4345 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
4346 $ git merge dma-buf/for-next
4347 Auto-merging drivers/base/dma-buf.c
4348 Merge made by the 'recursive' strategy.
4349 drivers/base/dma-buf.c | 2 ++
4350 1 file changed, 2 insertions(+)
4351 Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
4352 $ git merge userns/for-next
4354 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
4355 $ git merge ktest/for-next
4357 Merging signal/for-next (8a7d0dd Merge branch 'arch-s390' into for-next)
4358 $ git merge signal/for-next
4359 Auto-merging include/linux/sched.h
4360 Auto-merging arch/s390/kernel/entry64.S
4361 Auto-merging arch/powerpc/include/asm/unistd.h
4362 Auto-merging arch/mips/kernel/scall64-n32.S
4363 Auto-merging arch/mips/kernel/mips_ksyms.c
4364 Auto-merging arch/mips/Kconfig
4365 Merge made by the 'recursive' strategy.
4366 arch/alpha/kernel/entry.S | 21 +--
4367 arch/alpha/kernel/process.c | 49 +++----
4368 arch/alpha/kernel/signal.c | 16 +--
4369 arch/arm64/Kconfig | 2 +
4370 arch/arm64/include/asm/processor.h | 5 -
4371 arch/arm64/include/asm/syscalls.h | 14 +-
4372 arch/arm64/include/asm/unistd.h | 1 +
4373 arch/arm64/include/asm/unistd32.h | 8 +-
4374 arch/arm64/kernel/entry.S | 17 +--
4375 arch/arm64/kernel/process.c | 83 +++++-------
4376 arch/arm64/kernel/sys.c | 76 +----------
4377 arch/arm64/kernel/sys32.S | 19 ---
4378 arch/arm64/kernel/sys_compat.c | 38 +-----
4379 arch/c6x/Kconfig | 1 +
4380 arch/c6x/include/uapi/asm/unistd.h | 1 -
4381 arch/c6x/kernel/entry.S | 12 +-
4382 arch/frv/Kconfig | 1 +
4383 arch/frv/include/asm/unistd.h | 1 -
4384 arch/frv/kernel/entry.S | 28 +---
4385 arch/hexagon/Kconfig | 2 +
4386 arch/hexagon/include/asm/processor.h | 1 -
4387 arch/hexagon/include/uapi/asm/ptrace.h | 4 +
4388 arch/hexagon/include/uapi/asm/unistd.h | 1 +
4389 arch/hexagon/kernel/process.c | 102 +++++----------
4390 arch/hexagon/kernel/signal.c | 4 +-
4391 arch/hexagon/kernel/syscall.c | 44 +------
4392 arch/hexagon/kernel/vm_entry.S | 4 +
4393 arch/ia64/Kconfig | 2 +
4394 arch/ia64/include/asm/processor.h | 16 ---
4395 arch/ia64/include/asm/unistd.h | 1 +
4396 arch/ia64/kernel/entry.S | 39 +++---
4397 arch/ia64/kernel/head.S | 13 --
4398 arch/ia64/kernel/process.c | 158 +++++++++-------------
4399 arch/m68k/Kconfig | 1 +
4400 arch/m68k/include/asm/unistd.h | 1 -
4401 arch/m68k/kernel/entry.S | 7 -
4402 arch/mips/Kconfig | 2 +
4403 arch/mips/include/asm/processor.h | 2 -
4404 arch/mips/include/asm/ptrace.h | 6 +
4405 arch/mips/include/asm/unistd.h | 1 +
4406 arch/mips/kernel/entry.S | 6 +
4407 arch/mips/kernel/linux32.c | 21 ---
4408 arch/mips/kernel/mips_ksyms.c | 2 -
4409 arch/mips/kernel/process.c | 62 ++++-----
4410 arch/mips/kernel/scall64-n32.S | 2 +-
4411 arch/mips/kernel/scall64-o32.S | 2 +-
4412 arch/mips/kernel/syscall.c | 53 --------
4413 arch/openrisc/Kconfig | 2 +
4414 arch/openrisc/include/uapi/asm/unistd.h | 2 +
4415 arch/openrisc/kernel/entry.S | 43 +++---
4416 arch/openrisc/kernel/process.c | 163 ++++++++---------------
4417 arch/parisc/Kconfig | 2 +
4418 arch/parisc/include/asm/unistd.h | 1 +
4419 arch/parisc/kernel/entry.S | 217 +++----------------------------
4420 arch/parisc/kernel/process.c | 96 +++-----------
4421 arch/parisc/kernel/sys_parisc32.c | 22 ----
4422 arch/parisc/kernel/syscall_table.S | 2 +-
4423 arch/powerpc/Kconfig | 1 +
4424 arch/powerpc/include/asm/unistd.h | 1 -
4425 arch/powerpc/kernel/entry_32.S | 5 -
4426 arch/powerpc/kernel/entry_64.S | 8 +-
4427 arch/powerpc/kernel/process.c | 41 ++----
4428 arch/s390/Kconfig | 1 +
4429 arch/s390/include/asm/unistd.h | 1 -
4430 arch/s390/kernel/entry.S | 32 +----
4431 arch/s390/kernel/entry64.S | 26 +---
4432 arch/sparc/Kconfig | 2 +
4433 arch/sparc/include/asm/processor_32.h | 1 -
4434 arch/sparc/include/asm/processor_64.h | 11 +-
4435 arch/sparc/include/asm/ptrace.h | 10 +-
4436 arch/sparc/include/asm/switch_to_64.h | 2 +-
4437 arch/sparc/include/asm/syscalls.h | 2 -
4438 arch/sparc/include/asm/thread_info_64.h | 25 ++--
4439 arch/sparc/include/asm/uaccess_64.h | 4 +-
4440 arch/sparc/include/asm/unistd.h | 1 +
4441 arch/sparc/kernel/entry.S | 51 ++++----
4442 arch/sparc/kernel/etrap_64.S | 8 +-
4443 arch/sparc/kernel/process_32.c | 152 +++++++---------------
4444 arch/sparc/kernel/process_64.c | 143 +++++---------------
4445 arch/sparc/kernel/sys_sparc32.c | 36 -----
4446 arch/sparc/kernel/sys_sparc_32.c | 24 ----
4447 arch/sparc/kernel/sys_sparc_64.c | 22 ----
4448 arch/sparc/kernel/syscalls.S | 30 ++---
4449 arch/sparc/kernel/systbls_64.S | 2 +-
4450 arch/sparc/kernel/traps_64.c | 4 +-
4451 arch/sparc/mm/init_64.c | 2 +-
4452 arch/tile/Kconfig | 2 +
4453 arch/tile/include/asm/compat.h | 15 +--
4454 arch/tile/include/asm/elf.h | 1 +
4455 arch/tile/include/asm/processor.h | 4 +
4456 arch/tile/include/asm/switch_to.h | 5 +-
4457 arch/tile/include/asm/syscalls.h | 20 ++-
4458 arch/tile/include/asm/unistd.h | 1 +
4459 arch/tile/kernel/compat.c | 5 +-
4460 arch/tile/kernel/compat_signal.c | 10 +-
4461 arch/tile/kernel/entry.S | 11 --
4462 arch/tile/kernel/intvec_32.S | 29 +++--
4463 arch/tile/kernel/intvec_64.S | 30 +++--
4464 arch/tile/kernel/process.c | 170 +++++++-----------------
4465 arch/tile/kernel/signal.c | 9 +-
4466 arch/tile/kernel/sys.c | 9 +-
4467 arch/tile/mm/fault.c | 5 +-
4468 arch/um/kernel/process.c | 2 -
4469 arch/um/kernel/syscall.c | 8 +-
4470 drivers/staging/gdm72xx/gdm_usb.c | 4 +-
4472 fs/fs_struct.c | 24 ----
4473 include/linux/compat.h | 2 -
4474 include/linux/fdtable.h | 1 -
4475 include/linux/fs_struct.h | 1 -
4476 include/linux/sched.h | 1 -
4477 kernel/exit.c | 92 -------------
4478 112 files changed, 692 insertions(+), 1925 deletions(-)
4479 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
4480 $ git merge clk/clk-next
4482 Merging random/dev (c5c1244 random: fix debug format strings)
4483 $ git merge random/dev
4484 Merge made by the 'recursive' strategy.
4485 drivers/char/random.c | 14 +++++---------
4486 1 file changed, 5 insertions(+), 9 deletions(-)
4487 Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
4488 $ git merge lzo-update/lzo-update
4489 Removing lib/lzo/lzo1x_decompress.c
4490 Auto-merging crypto/testmgr.h
4491 Merge made by the 'recursive' strategy.
4492 crypto/testmgr.h | 38 ++---
4493 include/linux/lzo.h | 15 +-
4494 lib/decompress_unlzo.c | 2 +-
4495 lib/lzo/Makefile | 2 +-
4496 lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------
4497 lib/lzo/lzo1x_decompress.c | 255 -----------------------------
4498 lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++
4499 lib/lzo/lzodefs.h | 34 +++-
4500 8 files changed, 488 insertions(+), 430 deletions(-)
4501 delete mode 100644 lib/lzo/lzo1x_decompress.c
4502 create mode 100644 lib/lzo/lzo1x_decompress_safe.c
4503 Merging drop-experimental/linux-next (bf5b2bf net/xfrm: remove CONFIG_EXPERIMENTAL)
4504 $ git merge drop-experimental/linux-next
4505 Auto-merging net/mac80211/Kconfig
4506 Auto-merging init/Kconfig
4507 Auto-merging drivers/net/usb/Kconfig
4508 Auto-merging drivers/net/ethernet/ti/Kconfig
4509 Auto-merging drivers/mmc/host/Kconfig
4510 Merge made by the 'recursive' strategy.
4511 drivers/media/Kconfig | 7 +++----
4512 drivers/media/pci/cx25821/Kconfig | 2 +-
4513 drivers/media/platform/s5p-fimc/Kconfig | 1 -
4514 drivers/media/platform/s5p-tv/Kconfig | 3 +--
4515 drivers/media/usb/pvrusb2/Kconfig | 8 +++----
4516 drivers/mmc/core/Kconfig | 3 +--
4517 drivers/mmc/host/Kconfig | 20 +++++++-----------
4518 drivers/net/Kconfig | 9 ++++----
4519 drivers/net/ethernet/8390/Kconfig | 21 ++++++++-----------
4520 drivers/net/ethernet/atheros/Kconfig | 8 +++----
4521 drivers/net/ethernet/dec/tulip/Kconfig | 4 ++--
4522 drivers/net/ethernet/i825xx/Kconfig | 12 +++++------
4523 drivers/net/ethernet/intel/Kconfig | 9 ++------
4524 drivers/net/ethernet/natsemi/Kconfig | 3 ---
4525 drivers/net/ethernet/packetengines/Kconfig | 4 ++--
4526 drivers/net/ethernet/realtek/Kconfig | 4 ++--
4527 drivers/net/ethernet/silan/Kconfig | 6 +++---
4528 drivers/net/ethernet/ti/Kconfig | 4 ++--
4529 drivers/net/team/Kconfig | 3 +--
4530 drivers/net/usb/Kconfig | 16 +++++++-------
4531 drivers/net/wan/Kconfig | 8 +++----
4532 fs/ecryptfs/Kconfig | 4 ++--
4533 init/Kconfig | 31 ++--------------------------
4534 net/9p/Kconfig | 2 +-
4535 net/Kconfig | 5 ++---
4536 net/ceph/Kconfig | 4 ++--
4537 net/dccp/Kconfig | 4 ++--
4538 net/dccp/ccids/Kconfig | 5 ++---
4539 net/decnet/Kconfig | 4 ++--
4540 net/decnet/netfilter/Kconfig | 2 +-
4541 net/dsa/Kconfig | 2 +-
4542 net/ieee802154/Kconfig | 3 +--
4543 net/ipv4/Kconfig | 11 +---------
4544 net/ipv4/netfilter/Kconfig | 4 ++--
4545 net/ipv6/Kconfig | 24 +++++++++------------
4546 net/l2tp/Kconfig | 4 ++--
4547 net/lapb/Kconfig | 3 +--
4548 net/mac80211/Kconfig | 2 +-
4549 net/mac802154/Kconfig | 2 +-
4550 net/netfilter/Kconfig | 24 +++++++--------------
4551 net/nfc/Kconfig | 4 ++--
4552 net/nfc/llcp/Kconfig | 4 ++--
4553 net/nfc/nci/Kconfig | 4 ++--
4554 net/rds/Kconfig | 4 ++--
4555 net/rxrpc/Kconfig | 2 +-
4556 net/sctp/Kconfig | 4 ++--
4557 net/sunrpc/Kconfig | 2 +-
4558 net/tipc/Kconfig | 4 ++--
4559 net/wanrouter/Kconfig | 1 -
4560 net/x25/Kconfig | 3 +--
4561 net/xfrm/Kconfig | 16 +++++++-------
4562 51 files changed, 132 insertions(+), 211 deletions(-)
4563 Merging scsi-post-merge/merge-base:master ()
4564 Merging akpm-current/current (417b23b revert "epoll: support for disabling items, and a self-test app")
4565 $ git merge akpm-current/current
4566 CONFLICT (modify/delete): tools/testing/selftests/epoll/test_epoll.c deleted in akpm-current/current and modified in HEAD. Version HEAD of tools/testing/selftests/epoll/test_epoll.c left in tree.
4567 Removing tools/testing/selftests/epoll/Makefile
4568 Automatic merge failed; fix conflicts and then commit the result.
4569 $ git rm -f tools/testing/selftests/epoll/test_epoll.c
4570 tools/testing/selftests/epoll/test_epoll.c: needs merge
4571 rm 'tools/testing/selftests/epoll/test_epoll.c'
4573 [master ce1270d] Merge branch 'akpm-current/current'
4574 $ git diff -M --stat --summary HEAD^..
4575 fs/eventpoll.c | 38 +--
4576 include/uapi/linux/eventpoll.h | 1 -
4577 tools/testing/selftests/Makefile | 2 +-
4578 tools/testing/selftests/epoll/Makefile | 11 -
4579 tools/testing/selftests/epoll/test_epoll.c | 344 ----------------------------
4580 5 files changed, 4 insertions(+), 392 deletions(-)
4581 delete mode 100644 tools/testing/selftests/epoll/Makefile
4582 delete mode 100644 tools/testing/selftests/epoll/test_epoll.c
4583 $ git clone -s -l -n -q . ../rebase-tmp
4585 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
4587 * [new branch] akpm/master -> akpm
4588 $ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
4590 * [new branch] akpm/master-base -> akpm-base
4592 Switched to branch 'akpm'
4593 $ git rebase --onto master akpm-base
4594 First, rewinding head to replay your work on top of it...
4595 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
4596 Applying: proc: check vma->vm_file before dereferencing
4597 Applying: memstick: remove unused field from state struct
4598 Applying: memstick: ms_block: fix compile issue
4599 Applying: memstick: use after free in msb_disk_release()
4600 Applying: memstick: memory leak on error in msb_ftl_scan()
4601 Applying: CRIS: Fix I/O macros
4602 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
4603 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
4604 Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
4605 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
4606 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
4607 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
4608 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
4609 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
4610 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
4611 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
4612 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
4613 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
4614 Applying: x86 numa: don't check if node is NUMA_NO_NODE
4615 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
4616 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
4617 Applying: olpc: fix olpc-xo1-sci.c build errors
4618 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
4619 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
4620 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
4621 Applying: timeconst.pl: remove deprecated defined(@array)
4622 Applying: time: don't inline EXPORT_SYMBOL functions
4623 Applying: fs/pstore/ram.c: fix up section annotations
4624 Applying: h8300: select generic atomic64_t support
4625 Applying: drivers/message/fusion/mptscsih.c: missing break
4626 Applying: cciss: cleanup bitops usage
4627 Applying: cciss: use check_signature()
4628 Applying: block: store partition_meta_info.uuid as a string
4629 Applying: init: reduce PARTUUID min length to 1 from 36
4630 Applying: block: partition: msdos: provide UUIDs for partitions
4631 Applying: drbd: use copy_highpage
4632 Applying: vfs: increment iversion when a file is truncated
4633 Applying: fs: change return values from -EACCES to -EPERM
4634 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
4635 Applying: mm/page_alloc.c: remove duplicate check
4636 Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
4637 Applying: mm: show migration types in show_mem
4638 Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
4639 Applying: memory hotplug: suppress "Device nodeX does not have a release() function" warning
4640 Applying: mm, memcg: make mem_cgroup_out_of_memory() static
4641 Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
4642 Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
4643 Applying: thp: clean up __collapse_huge_page_isolate
4644 Applying: thp-clean-up-__collapse_huge_page_isolate v2
4645 Applying: mm: introduce mm_find_pmd()
4646 Applying: thp: introduce hugepage_vma_check()
4647 Applying: thp: cleanup: introduce mk_huge_pmd()
4648 Applying: memory-hotplug: skip HWPoisoned page when offlining pages
4649 Applying: memory-hotplug: update mce_bad_pages when removing the memory
4650 Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
4651 Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
4652 Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
4653 Applying: memory-hotplug: allocate zone's pcp before onlining pages
4654 Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
4655 Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
4656 Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
4657 Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
4658 Applying: slab: ignore internal flags in cache creation
4659 Applying: drop_caches: add some documentation and info messsge
4660 Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
4661 Applying: swap: add a simple detector for inappropriate swapin readahead
4662 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
4663 Applying: mm/memblock: reduce overhead in binary search
4664 Applying: scripts/pnmtologo: fix for plain PBM
4665 Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
4666 Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
4667 Applying: scripts/tags.sh: add magic for declarations of popular kernel type
4668 Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
4669 Applying: backlight: 88pm860x_bl: fix checkpatch warning
4670 Applying: backlight: atmel-pwm-bl: fix checkpatch warning
4671 Applying: backlight: corgi_lcd: fix checkpatch error and warning
4672 Applying: backlight: da903x_bl: fix checkpatch warning
4673 Applying: backlight: generic_bl: fix checkpatch warning
4674 Applying: backlight: hp680_bl: fix checkpatch error and warning
4675 Applying: backlight: ili9320: fix checkpatch error and warning
4676 Applying: backlight: jornada720: fix checkpatch error and warning
4677 Applying: backlight: l4f00242t03: fix checkpatch warning
4678 Applying: backlight: lm3630: fix checkpatch warning
4679 Applying: backlight: locomolcd: fix checkpatch error and warning
4680 Applying: backlight: omap1: fix checkpatch warning
4681 Applying: backlight: pcf50633: fix checkpatch warning
4682 Applying: backlight: platform_lcd: fix checkpatch error
4683 Applying: backlight: tdo24m: fix checkpatch warning
4684 Applying: backlight: tosa: fix checkpatch error and warning
4685 Applying: backlight: vgg2432a4: fix checkpatch warning
4686 Applying: backlight: lms283gf05: use devm_gpio_request_one
4687 Applying: backlight: tosa: use devm_gpio_request_one
4688 Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
4689 Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
4690 Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
4691 Applying: drivers/video/backlight/da9052_bl.c: add missing const
4692 Applying: drivers/video/backlight/lms283gf05.c: add missing const
4693 Applying: drivers/video/backlight/tdo24m.c: add missing const
4694 Applying: drivers/video/backlight/vgg2432a4.c: add missing const
4695 Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
4696 Applying: string: introduce helper to get base file name from given path
4697 Applying: lib: dynamic_debug: use kbasename()
4698 Applying: staging: rts_pstor: use kbasename()
4699 Applying: mm: use kbasename()
4700 Applying: procfs: use kbasename()
4701 Applying: trace: use kbasename()
4702 Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
4703 Using index info to reconstruct a base tree...
4704 M arch/tile/include/asm/compat.h
4705 M arch/tile/kernel/compat.c
4706 Falling back to patching base and 3-way merge...
4707 Auto-merging arch/tile/kernel/compat.c
4708 Auto-merging arch/tile/include/asm/compat.h
4709 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
4710 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
4711 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
4712 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
4713 Applying: checkpatch: improve network block comment style checking
4714 Applying: binfmt_elf: fix corner case kfree of uninitialized data
4715 Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
4716 Applying: rtc: omap: kicker mechanism support
4717 Applying: ARM: davinci: remove rtc kicker release
4718 Applying: rtc: omap: dt support
4719 Applying: rtc: omap: depend on am33xx
4720 Applying: rtc: omap: add runtime pm support
4721 Applying: drivers/rtc/rtc-imxdi: support for i.MX53
4722 Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
4723 Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
4724 Applying: hfsplus: add on-disk layout declarations related to attributes tree
4725 Applying: hfsplus: add functionality of manipulating by records in attributes tree
4726 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
4727 Applying: hfsplus: add support of manipulation by attributes file
4728 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
4729 Applying: hfsplus: code style fixes - reworked support of extended attributes
4730 Applying: fat: modify nfs mount option
4731 Applying: fat (exportfs): rebuild inode if ilookup() fails
4732 Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
4733 Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails
4734 Applying: Documentation: update nfs option in filesystem/vfat.txt
4735 Applying: kstrto*: add documentation
4736 Applying: simple_strto*: annotate function as obsolete
4737 Applying: proc: don't show nonexistent capabilities
4738 Applying: procfs: add VmFlags field in smaps output
4739 Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
4740 Applying: ipc: remove forced assignment of selected message
4741 Applying: ipc: add sysctl to specify desired next object id
4742 Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
4743 Applying: ipc: message queue receive cleanup
4744 Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
4745 Applying: ipc: message queue copy feature introduced
4746 Applying: selftests: IPC message queue copy feature test
4747 Applying: selftests-ipc-message-queue-copy-feature-test-checkpatch-fixes
4748 Applying: ipc/sem.c: alternatives to preempt_disable()
4749 Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
4750 Applying: Documentation/sparse.txt: document context annotations for lock checking
4751 Applying: aoe: describe the behavior of the "err" character device
4752 Applying: aoe: print warning regarding a common reason for dropped transmits
4753 Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
4754 Applying: aoe: avoid using skb member after dev_queue_xmit
4755 Applying: aoe: update cap on outstanding commands based on config query response
4756 Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
4757 Applying: aoe: support larger I/O requests via aoe_maxsectors module param
4758 Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
4759 Applying: aoe: cleanup: remove unused ata_scnt function
4760 Applying: aoe: whitespace cleanup
4761 Applying: aoe: update driver-internal version number to 60
4762 Applying: documentation-dma-api-howtotxt-add-dma-mapping-error-check-usage-examples-fix
4763 Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
4764 Applying: mm-introduce-mm_find_pmd-fix
4766 $ git fetch -f ../rebase-tmp akpm:akpm/master
4768 + 85efa12...822854b akpm -> akpm/master (forced update)
4769 $ rm -rf ../rebase-tmp
4770 Merging akpm/master (822854b mm-introduce-mm_find_pmd-fix)
4771 $ git merge --no-ff akpm/master
4772 Merge made by the 'recursive' strategy.
4773 Documentation/DMA-API-HOWTO.txt | 2 +-
4774 Documentation/DocBook/kernel-api.tmpl | 3 +
4775 Documentation/backlight/lp855x-driver.txt | 10 +-
4776 .../devicetree/bindings/rtc/imxdi-rtc.txt | 17 +
4777 Documentation/devicetree/bindings/rtc/rtc-omap.txt | 17 +
4778 Documentation/filesystems/proc.txt | 40 +-
4779 Documentation/filesystems/vfat.txt | 23 +-
4780 Documentation/memory-hotplug.txt | 5 +-
4781 Documentation/sparse.txt | 18 +
4782 Documentation/sysctl/vm.txt | 33 +-
4783 arch/arm/mach-davinci/devices-da8xx.c | 13 +-
4784 arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
4785 arch/arm64/include/asm/unistd.h | 1 +
4786 arch/arm64/kernel/sys_compat.c | 15 -
4787 arch/cris/include/asm/io.h | 39 +-
4788 arch/h8300/Kconfig | 1 +
4789 arch/powerpc/include/asm/machdep.h | 36 +-
4790 arch/powerpc/include/asm/systbl.h | 2 +-
4791 arch/powerpc/include/asm/unistd.h | 1 +
4792 arch/powerpc/kernel/sys_ppc32.c | 17 +-
4793 arch/sparc/include/asm/unistd.h | 1 +
4794 arch/sparc/kernel/sys_sparc32.c | 14 -
4795 arch/tile/include/asm/compat.h | 2 -
4796 arch/tile/include/asm/unistd.h | 1 +
4797 arch/tile/kernel/compat.c | 18 -
4798 arch/x86/Kconfig | 1 +
4799 arch/x86/include/asm/uv/uv.h | 2 +-
4800 arch/x86/kernel/acpi/boot.c | 7 +-
4801 arch/x86/mm/numa.c | 3 +-
4802 arch/x86/platform/iris/iris.c | 67 ++-
4803 arch/x86/platform/uv/tlb_uv.c | 10 +-
4804 arch/x86/tools/insn_sanity.c | 10 +-
4805 block/genhd.c | 8 +-
4806 block/partitions/efi.c | 7 +-
4807 block/partitions/msdos.c | 21 +-
4808 drivers/acpi/acpi_memhotplug.c | 123 +++--
4809 drivers/base/memory.c | 9 +-
4810 drivers/base/node.c | 11 +
4811 drivers/block/aoe/aoe.h | 10 +-
4812 drivers/block/aoe/aoeblk.c | 19 +
4813 drivers/block/aoe/aoechr.c | 7 +-
4814 drivers/block/aoe/aoecmd.c | 22 +-
4815 drivers/block/aoe/aoedev.c | 44 +-
4816 drivers/block/aoe/aoemain.c | 2 +-
4817 drivers/block/aoe/aoenet.c | 13 +-
4818 drivers/block/cciss.c | 21 +-
4819 drivers/block/drbd/drbd_bitmap.c | 7 +-
4820 drivers/firmware/dmi_scan.c | 78 ++-
4821 drivers/gpu/drm/i915/intel_pm.c | 3 +-
4822 drivers/memstick/core/ms_block.c | 8 +-
4823 drivers/memstick/core/ms_block.h | 5 +-
4824 drivers/message/fusion/mptscsih.c | 1 +
4825 drivers/pcmcia/cs.c | 37 +-
4826 drivers/rtc/Kconfig | 12 +-
4827 drivers/rtc/rtc-imxdi.c | 11 +
4828 drivers/rtc/rtc-omap.c | 80 ++-
4829 drivers/staging/rts_pstor/trace.h | 24 +-
4830 drivers/video/backlight/88pm860x_bl.c | 4 +-
4831 drivers/video/backlight/atmel-pwm-bl.c | 7 +-
4832 drivers/video/backlight/corgi_lcd.c | 16 +-
4833 drivers/video/backlight/da903x_bl.c | 15 +-
4834 drivers/video/backlight/da9052_bl.c | 2 +-
4835 drivers/video/backlight/generic_bl.c | 4 +-
4836 drivers/video/backlight/hp680_bl.c | 4 +-
4837 drivers/video/backlight/ili9320.c | 14 +-
4838 drivers/video/backlight/ili9320.h | 2 +-
4839 drivers/video/backlight/jornada720_bl.c | 34 +-
4840 drivers/video/backlight/jornada720_lcd.c | 3 +-
4841 drivers/video/backlight/l4f00242t03.c | 3 +-
4842 drivers/video/backlight/lm3630_bl.c | 2 +-
4843 drivers/video/backlight/lms283gf05.c | 16 +-
4844 drivers/video/backlight/locomolcd.c | 65 ++-
4845 drivers/video/backlight/lp855x_bl.c | 51 +-
4846 drivers/video/backlight/omap1_bl.c | 4 +-
4847 drivers/video/backlight/pcf50633-backlight.c | 8 +-
4848 drivers/video/backlight/platform_lcd.c | 2 +-
4849 drivers/video/backlight/s6e63m0.c | 2 +-
4850 drivers/video/backlight/tdo24m.c | 33 +-
4851 drivers/video/backlight/tosa_bl.c | 10 +-
4852 drivers/video/backlight/tosa_lcd.c | 24 +-
4853 drivers/video/backlight/vgg2432a4.c | 10 +-
4855 fs/autofs4/root.c | 2 +-
4856 fs/binfmt_elf.c | 4 +-
4857 fs/block_dev.c | 9 +-
4858 fs/btrfs/disk-io.c | 8 +-
4859 fs/btrfs/file.c | 3 +-
4860 fs/btrfs/ioctl.c | 2 +-
4862 fs/debugfs/inode.c | 1 -
4863 fs/dlm/config.c | 2 +-
4864 fs/drop_caches.c | 2 +
4865 fs/fat/fat.h | 17 +-
4867 fs/fat/inode.c | 36 +-
4868 fs/fat/nfs.c | 233 ++++++++-
4869 fs/gfs2/sys.c | 18 +-
4870 fs/hfsplus/Makefile | 3 +-
4871 fs/hfsplus/attributes.c | 399 ++++++++++++++
4872 fs/hfsplus/bfind.c | 79 ++-
4873 fs/hfsplus/bnode.c | 6 +-
4874 fs/hfsplus/brec.c | 23 +-
4875 fs/hfsplus/btree.c | 8 +
4876 fs/hfsplus/catalog.c | 36 +-
4877 fs/hfsplus/dir.c | 6 +-
4878 fs/hfsplus/extents.c | 4 +-
4879 fs/hfsplus/hfsplus_fs.h | 41 +-
4880 fs/hfsplus/hfsplus_raw.h | 68 ++-
4881 fs/hfsplus/inode.c | 13 +
4882 fs/hfsplus/ioctl.c | 542 +++++++++++++++++---
4883 fs/hfsplus/super.c | 33 +-
4884 fs/hfsplus/unicode.c | 7 +-
4885 fs/ncpfs/ioctl.c | 2 +-
4886 fs/ocfs2/file.c | 5 +-
4887 fs/proc/array.c | 9 +
4888 fs/proc/base.c | 11 +-
4889 fs/proc/proc_devtree.c | 7 +-
4890 fs/proc/task_mmu.c | 53 ++
4891 fs/pstore/ram.c | 12 +-
4893 fs/udf/file.c | 2 +-
4894 include/linux/compat.h | 3 +
4895 include/linux/compiler.h | 2 +
4896 include/linux/genhd.h | 8 +-
4897 include/linux/gfp.h | 2 +-
4898 include/linux/init.h | 40 +-
4899 include/linux/ipc_namespace.h | 1 +
4900 include/linux/kernel.h | 47 +-
4901 include/linux/memory.h | 1 +
4902 include/linux/msg.h | 5 +-
4903 include/linux/oom.h | 2 -
4904 include/linux/page-isolation.h | 10 +-
4905 include/linux/platform_data/lp855x.h | 9 +-
4906 include/linux/rmap.h | 3 +
4907 include/linux/string.h | 11 +
4908 include/linux/writeback.h | 9 +-
4909 include/uapi/linux/msg.h | 1 +
4910 init/do_mounts.c | 61 ++-
4911 ipc/compat.c | 45 +-
4912 ipc/ipc_sysctl.c | 28 +
4914 ipc/msgutil.c | 38 ++
4915 ipc/sem.c | 250 ++++++---
4918 kernel/compat.c | 17 +
4919 kernel/time.c | 4 +-
4920 kernel/timeconst.pl | 2 +-
4921 kernel/trace/trace_uprobe.c | 8 +-
4922 lib/dynamic_debug.c | 9 +-
4923 lib/kstrtox.c | 64 +++
4924 lib/vsprintf.c | 8 +
4925 mm/huge_memory.c | 152 ++----
4926 mm/internal.h | 53 ++
4929 mm/memcontrol.c | 4 +-
4930 mm/memory-failure.c | 2 +-
4932 mm/memory_hotplug.c | 149 +++++-
4933 mm/migrate.c | 14 +-
4934 mm/page-writeback.c | 11 +-
4935 mm/page_alloc.c | 102 +++-
4936 mm/page_cgroup.c | 3 +
4937 mm/page_isolation.c | 27 +-
4942 mm/slab_common.c | 7 +
4945 mm/swap_state.c | 6 +
4948 scripts/checkpatch.pl | 6 +-
4949 scripts/pnmtologo.c | 9 +
4950 scripts/tags.sh | 41 +-
4951 security/selinux/netnode.c | 3 +-
4952 tools/testing/selftests/ipc/Makefile | 25 +
4953 tools/testing/selftests/ipc/msgque.c | 231 +++++++++
4954 tools/testing/selftests/kcmp/kcmp_test.c | 6 +-
4955 182 files changed, 3760 insertions(+), 1146 deletions(-)
4956 create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
4957 create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
4958 create mode 100644 fs/hfsplus/attributes.c
4959 create mode 100644 tools/testing/selftests/ipc/Makefile
4960 create mode 100644 tools/testing/selftests/ipc/msgque.c
projects / karo-tx-linux.git / blob