2 Monday 29 October 10:05:32 EST 2012
5 $ git reset --hard stable
6 HEAD is now at 2ab3f29 Merge branch 'akpm' (Andrew's fixes)
7 Merging origin/master (8f0d816 Linux 3.7-rc3)
8 $ git merge origin/master
9 Updating 2ab3f29..8f0d816
11 .../devicetree/bindings/arm/atmel-at91.txt | 2 +-
12 Documentation/firmware_class/README | 26 +-
13 Documentation/zh_CN/IRQ.txt | 39 ++
14 Documentation/zh_CN/arm64/booting.txt | 156 ++++++
15 Documentation/zh_CN/arm64/memory.txt | 93 ++++
18 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 +-
19 arch/arm/boot/dts/dbx5x0.dtsi | 17 +-
20 arch/arm/boot/dts/exynos4210-trats.dts | 6 +-
21 arch/arm/boot/dts/imx23.dtsi | 1 +
22 arch/arm/boot/dts/imx28.dtsi | 1 +
23 arch/arm/boot/dts/omap3.dtsi | 4 +-
24 arch/arm/configs/imx_v6_v7_defconfig | 2 +
25 arch/arm/configs/mvebu_defconfig | 10 +-
26 arch/arm/configs/versatile_defconfig | 1 +
27 arch/arm/include/asm/dma-mapping.h | 1 -
28 arch/arm/include/debug/8250_32.S | 27 ++
29 arch/arm/include/debug/picoxcell.S | 18 +-
30 arch/arm/include/debug/socfpga.S | 5 +
31 arch/arm/mach-at91/Kconfig | 10 +-
32 arch/arm/mach-at91/at91rm9200.c | 2 +-
33 arch/arm/mach-at91/at91rm9200_devices.c | 4 +-
34 arch/arm/mach-at91/at91sam9260.c | 4 +-
35 arch/arm/mach-at91/at91sam9260_devices.c | 4 +-
36 arch/arm/mach-at91/at91sam9261.c | 4 +-
37 arch/arm/mach-at91/at91sam9261_devices.c | 4 +-
38 arch/arm/mach-at91/at91sam9263.c | 2 +-
39 arch/arm/mach-at91/at91sam9263_devices.c | 4 +-
40 arch/arm/mach-at91/at91sam9rl_devices.c | 4 +-
41 arch/arm/mach-at91/at91x40.c | 2 +-
42 arch/arm/mach-at91/board-neocore926.c | 2 +-
43 arch/arm/mach-at91/board-sam9261ek.c | 2 +-
44 arch/arm/mach-at91/board-sam9263ek.c | 2 +-
45 arch/arm/mach-at91/generic.h | 3 +-
46 arch/arm/mach-at91/irq.c | 9 +-
47 arch/arm/mach-at91/setup.c | 4 +-
48 arch/arm/mach-exynos/common.c | 5 +
49 arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
50 arch/arm/mach-imx/clk-busy.c | 2 +-
51 arch/arm/mach-imx/clk-imx25.c | 4 +-
52 arch/arm/mach-imx/clk-imx27.c | 4 +-
53 arch/arm/mach-imx/mm-imx3.c | 5 +-
54 arch/arm/mach-omap2/Kconfig | 1 -
55 arch/arm/mach-omap2/board-omap3beagle.c | 22 +-
56 arch/arm/mach-omap2/clock33xx_data.c | 2 +
57 arch/arm/mach-omap2/mux34xx.c | 8 +-
58 arch/arm/mach-omap2/pm.h | 1 +
59 arch/arm/mach-omap2/pm34xx.c | 30 +-
60 arch/arm/mach-omap2/serial.c | 5 +
61 arch/arm/mach-s3c24xx/s3c2416.c | 2 +
62 arch/arm/mach-s3c24xx/s3c2443.c | 4 +
63 arch/arm/mach-s5p64x0/common.c | 3 +
64 arch/arm/mach-s5pc100/common.c | 3 +
65 arch/arm/mach-s5pv210/common.c | 3 +
66 arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
67 arch/arm/mach-ux500/cpu.c | 1 +
68 arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 2 +-
69 arch/arm/plat-omap/Kconfig | 1 +
70 arch/arm/plat-omap/include/plat/omap-serial.h | 4 +-
71 arch/arm/plat-samsung/include/plat/spi-core.h | 30 ++
72 arch/x86/include/asm/efi.h | 6 +-
73 arch/x86/kernel/apic/io_apic.c | 3 +
74 arch/x86/kernel/cpu/perf_event.c | 10 +-
75 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 45 +-
76 arch/x86/kernel/cpu/perf_event_knc.c | 93 +++-
77 arch/x86/kernel/cpu/perf_event_p6.c | 127 ++++-
78 arch/x86/kernel/e820.c | 3 +
79 arch/x86/kernel/setup.c | 27 +-
80 arch/x86/mm/init.c | 58 +--
81 arch/x86/mm/init_64.c | 7 +-
82 arch/x86/platform/efi/efi.c | 47 +-
83 arch/x86/platform/efi/efi_64.c | 7 +-
84 drivers/acpi/glue.c | 1 +
85 drivers/acpi/processor_driver.c | 1 +
86 drivers/base/firmware_class.c | 266 ++++++-----
87 drivers/base/power/domain.c | 5 +-
88 drivers/bcma/main.c | 5 +-
89 drivers/char/sonypi.c | 2 +-
90 drivers/cpufreq/cpufreq_stats.c | 1 +
91 drivers/cpufreq/powernow-k8.c | 9 +-
92 drivers/dma/imx-dma.c | 4 +-
93 drivers/dma/sirf-dma.c | 4 +-
94 drivers/extcon/extcon-adc-jack.c | 10 +-
95 drivers/extcon/extcon-class.c | 142 +++---
96 drivers/extcon/extcon-gpio.c | 1 -
97 drivers/extcon/extcon-max77693.c | 46 +-
98 drivers/extcon/extcon-max8997.c | 6 +-
99 drivers/gpu/drm/radeon/atombios_encoders.c | 5 +-
100 drivers/gpu/drm/radeon/evergreen_cs.c | 1 +
101 drivers/gpu/drm/radeon/ni.c | 45 +-
102 drivers/gpu/drm/radeon/nid.h | 1 +
103 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 6 +-
104 drivers/gpu/drm/radeon/radeon_device.c | 60 +--
105 drivers/gpu/drm/radeon/radeon_gart.c | 22 +-
106 drivers/gpu/drm/radeon/radeon_gem.c | 18 +-
107 drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 5 +-
108 drivers/gpu/drm/radeon/radeon_object.c | 19 -
109 drivers/gpu/drm/radeon/si.c | 47 +-
110 drivers/hv/channel.c | 24 +-
111 drivers/iio/Kconfig | 1 -
112 drivers/iio/Makefile | 1 -
113 drivers/infiniband/hw/cxgb4/mem.c | 2 +-
114 drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +-
115 drivers/infiniband/hw/mlx4/mad.c | 85 ++--
116 drivers/infiniband/hw/mlx4/mcg.c | 18 +-
117 drivers/isdn/gigaset/bas-gigaset.c | 19 +-
118 drivers/net/can/flexcan.c | 19 +-
119 drivers/net/can/sja1000/peak_pci.c | 13 +-
120 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 +
121 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 29 +-
122 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 +
123 drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +-
124 drivers/net/ethernet/mellanox/mlx4/en_tx.c | 3 +-
125 drivers/net/ethernet/mellanox/mlx4/eq.c | 24 +-
126 drivers/net/ethernet/mellanox/mlx4/main.c | 5 +-
127 .../net/ethernet/mellanox/mlx4/resource_tracker.c | 6 -
128 .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 116 ++---
129 drivers/net/ethernet/qlogic/qla3xxx.c | 9 +-
130 drivers/net/ethernet/ti/Kconfig | 2 +-
131 drivers/net/ethernet/tile/tilegx.c | 35 +-
132 drivers/net/phy/Kconfig | 5 +
133 drivers/net/phy/Makefile | 1 +
134 drivers/net/phy/at803x.c | 176 +++++++
135 drivers/net/usb/cdc_ether.c | 41 +-
136 drivers/net/usb/ipheth.c | 5 +
137 drivers/net/usb/qmi_wwan.c | 55 +++
138 drivers/net/usb/usbnet.c | 3 +
139 .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 +++----
140 drivers/net/wireless/ath/ath9k/hif_usb.c | 1 +
141 drivers/net/wireless/b43/main.c | 4 +
142 drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 +-
143 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 70 +--
144 drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
145 drivers/net/wireless/iwlwifi/dvm/devices.c | 39 +-
146 drivers/net/wireless/mwifiex/cfg80211.c | 7 +-
147 drivers/net/wireless/mwifiex/scan.c | 13 +-
148 drivers/net/wireless/rt2x00/rt2500usb.c | 1 +
149 drivers/net/wireless/rt2x00/rt2800usb.c | 1 +
150 drivers/net/wireless/rt2x00/rt73usb.c | 1 +
151 drivers/net/wireless/rtlwifi/usb.c | 2 +-
152 drivers/spi/spi-mxs.c | 3 +-
153 drivers/staging/android/binder.c | 30 +-
154 drivers/staging/comedi/drivers/8255_pci.c | 2 +
155 drivers/staging/comedi/drivers/amplc_dio200.c | 2 +
156 drivers/staging/comedi/drivers/amplc_pc236.c | 5 +-
157 drivers/staging/comedi/drivers/amplc_pc263.c | 2 +
158 drivers/staging/comedi/drivers/das08.c | 2 +
159 drivers/staging/comedi/drivers/ni_daq_700.c | 2 +-
160 drivers/staging/comedi/drivers/ni_labpc.c | 2 +
161 drivers/staging/iio/accel/adis16201_core.c | 24 +-
162 drivers/staging/iio/accel/adis16203_core.c | 20 +-
163 drivers/staging/iio/accel/adis16204_core.c | 22 +-
164 drivers/staging/iio/accel/adis16209_core.c | 18 +-
165 drivers/staging/iio/accel/adis16220_core.c | 19 +-
166 drivers/staging/iio/accel/adis16240_core.c | 23 +-
167 drivers/staging/iio/gyro/adis16260_core.c | 29 +-
168 drivers/staging/iio/imu/adis16400.h | 2 +
169 drivers/staging/iio/imu/adis16400_core.c | 70 ++-
170 drivers/staging/ipack/bridges/tpci200.c | 1 +
171 drivers/staging/omapdrm/omap_gem.c | 4 +-
172 drivers/staging/ramster/Kconfig | 1 +
173 drivers/staging/tidspbridge/core/tiomap3430.c | 37 +-
174 drivers/staging/tidspbridge/hw/hw_mmu.c | 115 +----
175 drivers/staging/tidspbridge/hw/hw_mmu.h | 31 +-
176 .../tidspbridge/include/dspbridge/cfgdefs.h | 4 +-
177 .../tidspbridge/include/dspbridge/host_os.h | 4 +-
178 drivers/staging/tidspbridge/rmgr/drv.c | 8 +-
179 drivers/staging/tidspbridge/rmgr/node.c | 21 +-
180 drivers/staging/zram/zram_drv.c | 12 +-
181 drivers/tty/serial/omap-serial.c | 12 +-
182 drivers/usb/core/hub.c | 7 +-
183 drivers/usb/gadget/net2272.c | 4 +-
184 drivers/usb/host/pci-quirks.c | 9 +-
185 drivers/usb/host/xhci-dbg.c | 2 -
186 drivers/usb/host/xhci-hub.c | 9 +-
187 drivers/usb/host/xhci-ring.c | 11 +
188 drivers/usb/host/xhci.c | 8 +-
189 drivers/usb/misc/ezusb.c | 1 +
190 drivers/usb/musb/musb_dsps.c | 8 +-
191 drivers/usb/renesas_usbhs/fifo.c | 1 +
192 drivers/usb/renesas_usbhs/mod_host.c | 5 +
193 drivers/usb/serial/ch341.c | 23 +-
194 drivers/usb/serial/digi_acceleport.c | 117 +++--
195 drivers/usb/serial/ipw.c | 7 +-
196 drivers/usb/serial/keyspan.c | 181 ++++---
197 drivers/usb/serial/keyspan.h | 8 +
198 drivers/usb/serial/mct_u232.c | 59 ++-
199 drivers/usb/serial/metro-usb.c | 65 +--
200 drivers/usb/serial/mos7720.c | 62 +--
201 drivers/usb/serial/mos7840.c | 495 ++++++++------------
202 drivers/usb/serial/omninet.c | 36 +-
203 drivers/usb/serial/opticon.c | 11 +-
204 drivers/usb/serial/option.c | 23 +-
205 drivers/usb/serial/qcserial.c | 33 +-
206 drivers/usb/serial/quatech2.c | 135 +++---
207 drivers/usb/serial/sierra.c | 133 +++---
208 drivers/usb/serial/usb-wwan.h | 2 +-
209 drivers/usb/serial/usb_wwan.c | 124 ++---
210 drivers/usb/serial/whiteheat.c | 60 ++-
211 drivers/usb/storage/unusual_devs.h | 6 +
212 drivers/vhost/net.c | 3 +-
213 fs/block_dev.c | 37 +-
214 fs/btrfs/backref.c | 28 +-
215 fs/btrfs/backref.h | 4 +
216 fs/btrfs/ctree.c | 70 ++-
217 fs/btrfs/ctree.h | 3 +
218 fs/btrfs/extent_io.c | 4 +-
219 fs/btrfs/inode.c | 7 +-
220 fs/btrfs/ioctl.c | 6 +-
221 fs/btrfs/qgroup.c | 17 +-
222 fs/btrfs/send.c | 156 +++---
223 fs/btrfs/transaction.c | 2 +-
224 fs/btrfs/volumes.c | 7 +
226 fs/lockd/mon.c | 57 ++-
228 fs/sysfs/dir.c | 16 +-
229 include/drm/drm_pciids.h | 3 +
230 include/linux/dynamic_debug.h | 2 +-
231 include/linux/extcon.h | 2 +-
232 include/linux/iio/iio.h | 16 +
233 include/linux/memblock.h | 1 +
234 include/linux/mfd/max77693.h | 13 +
235 include/linux/percpu-rwsem.h | 28 +-
236 include/linux/perf_event.h | 10 +-
237 include/linux/tcp.h | 3 +-
238 include/net/cfg80211.h | 1 +
239 include/uapi/linux/tcp.h | 1 +
241 net/8021q/vlan.c | 4 +-
242 net/batman-adv/bridge_loop_avoidance.c | 27 +-
243 net/batman-adv/routing.c | 8 +-
244 net/batman-adv/types.h | 2 +
245 net/bluetooth/smp.c | 6 +-
246 net/core/skbuff.c | 6 +-
247 net/ipv4/route.c | 9 +-
248 net/ipv4/tcp.c | 10 +-
249 net/ipv4/tcp_input.c | 13 +-
250 net/ipv4/tcp_ipv4.c | 1 +
251 net/ipv4/tcp_minisocks.c | 1 +
252 net/ipv4/tcp_timer.c | 4 +-
253 net/ipv6/route.c | 4 +-
254 net/mac80211/iface.c | 2 +-
255 net/mac80211/mlme.c | 35 +-
256 net/mac80211/sta_info.c | 4 +-
257 net/mac80211/util.c | 4 +-
258 net/mac80211/wpa.c | 14 +-
259 net/netfilter/ipvs/ip_vs_ctl.c | 3 +-
260 net/netfilter/xt_CT.c | 10 +-
261 net/netfilter/xt_TEE.c | 1 +
262 net/netfilter/xt_nat.c | 8 +-
263 net/netlink/af_netlink.c | 19 +-
264 net/sunrpc/xprtsock.c | 41 +-
265 net/wireless/mlme.c | 12 +-
266 sound/isa/opti9xx/miro.c | 1 -
267 sound/pci/als300.c | 4 +
268 sound/pci/hda/patch_realtek.c | 20 +-
269 sound/pci/rme9652/hdspm.c | 234 +++++----
270 sound/soc/codecs/wm8994.c | 18 +-
271 sound/soc/codecs/wm8994.h | 1 +
272 sound/soc/ux500/mop500.c | 17 +
273 sound/soc/ux500/ux500_msp_i2s.c | 8 +-
274 tools/perf/builtin-help.c | 2 +-
275 tools/perf/builtin-trace.c | 18 +-
276 tools/perf/util/parse-events-test.c | 12 +-
277 tools/perf/util/thread.c | 1 -
278 tools/testing/ktest/ktest.pl | 6 +-
279 268 files changed, 3731 insertions(+), 2396 deletions(-)
280 create mode 100644 Documentation/zh_CN/IRQ.txt
281 create mode 100644 Documentation/zh_CN/arm64/booting.txt
282 create mode 100644 Documentation/zh_CN/arm64/memory.txt
283 create mode 100644 arch/arm/include/debug/8250_32.S
284 delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h
285 delete mode 100644 arch/arm/mach-spear13xx/include/mach/spear1340_misc_regs.h
286 create mode 100644 arch/arm/plat-samsung/include/plat/spi-core.h
287 create mode 100644 drivers/net/phy/at803x.c
288 Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
289 $ git merge fixes/master
291 Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
292 $ git merge kbuild-current/rc-fixes
293 Merge made by the 'recursive' strategy.
294 scripts/kconfig/expr.h | 5 +--
295 scripts/kconfig/list.h | 91 +++++++++++++++++++++++++++++++++++++++++++
296 scripts/kconfig/lkc_proto.h | 4 +-
297 scripts/kconfig/mconf.c | 6 +--
298 scripts/kconfig/menu.c | 14 ++++---
299 5 files changed, 106 insertions(+), 14 deletions(-)
300 create mode 100644 scripts/kconfig/list.h
301 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)
302 $ git merge arm-current/fixes
304 Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
305 $ git merge m68k-current/for-linus
307 Merging powerpc-merge/merge (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
308 $ git merge powerpc-merge/merge
310 Merging sparc/master (f7e8d9f qlogicpti: Fix build warning.)
311 $ git merge sparc/master
312 Merge made by the 'recursive' strategy.
313 arch/sparc/include/asm/backoff.h | 69 ++++++++++++++++++++++++++-----
314 arch/sparc/include/asm/compat.h | 5 ++-
315 arch/sparc/include/asm/processor_64.h | 17 +++++++-
316 arch/sparc/include/asm/thread_info_64.h | 5 +++
317 arch/sparc/include/asm/ttable.h | 24 +++++++----
318 arch/sparc/include/uapi/asm/unistd.h | 7 +++-
319 arch/sparc/kernel/entry.h | 7 ++++
320 arch/sparc/kernel/perf_event.c | 22 +++++++---
321 arch/sparc/kernel/process_64.c | 42 ++++++++++---------
322 arch/sparc/kernel/ptrace_64.c | 4 +-
323 arch/sparc/kernel/setup_64.c | 21 ++++++++++
324 arch/sparc/kernel/sys_sparc_64.c | 5 +++
325 arch/sparc/kernel/systbls_32.S | 1 +
326 arch/sparc/kernel/systbls_64.S | 2 +
327 arch/sparc/kernel/unaligned_64.c | 36 ++++++++++------
328 arch/sparc/kernel/visemul.c | 23 +++++++----
329 arch/sparc/kernel/vmlinux.lds.S | 5 +++
330 arch/sparc/kernel/winfixup.S | 2 +
331 arch/sparc/math-emu/math_64.c | 2 +-
332 drivers/scsi/qlogicpti.c | 13 +-----
333 20 files changed, 228 insertions(+), 84 deletions(-)
334 Merging net/master (e657e07 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
335 $ git merge net/master
337 Merging sound-current/for-linus (1693849 Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
338 $ git merge sound-current/for-linus
339 Merge made by the 'recursive' strategy.
340 sound/pci/hda/patch_sigmatel.c | 2 ++
341 sound/soc/omap/omap-dmic.c | 4 ++--
342 sound/soc/omap/zoom2.c | 5 ++---
343 3 files changed, 6 insertions(+), 5 deletions(-)
344 Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
345 $ git merge pci-current/for-linus
347 Merging wireless/master (f89ff64 b43: Fix oops on unload when firmware not found)
348 $ git merge wireless/master
350 Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
351 $ git merge driver-core.current/driver-core-linus
353 Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
354 $ git merge tty.current/tty-linus
356 Merging usb.current/usb-linus (8f0d816 Linux 3.7-rc3)
357 $ git merge usb.current/usb-linus
359 Merging staging.current/staging-linus (8f0d816 Linux 3.7-rc3)
360 $ git merge staging.current/staging-linus
362 Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
363 $ git merge char-misc.current/char-misc-linus
365 Merging input-current/for-linus (88fd449 Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HD)
366 $ git merge input-current/for-linus
367 Auto-merging drivers/input/tablet/wacom_wac.c
368 Merge made by the 'recursive' strategy.
369 .../bindings/input/touchscreen/egalax-ts.txt | 19 ++++++++++++++++
370 drivers/input/tablet/wacom_wac.c | 3 +++
371 drivers/input/touchscreen/Kconfig | 2 +-
372 drivers/input/touchscreen/egalax_ts.c | 23 ++++++++++++++++++--
373 4 files changed, 44 insertions(+), 3 deletions(-)
374 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt
375 Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape delays.)
376 $ git merge md-current/for-linus
378 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
379 $ git merge audit-current/for-linus
381 Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
382 $ git merge crypto-current/master
383 Merge made by the 'recursive' strategy.
384 crypto/cryptd.c | 11 ++++++++---
385 1 file changed, 8 insertions(+), 3 deletions(-)
386 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
387 $ git merge ide/master
389 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
390 $ git merge dwmw2/master
392 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
393 $ git merge sh-current/sh-fixes-for-linus
395 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
396 $ git merge irqdomain-current/irqdomain/merge
398 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
399 $ git merge devicetree-current/devicetree/merge
400 Auto-merging drivers/of/base.c
401 Merge made by the 'recursive' strategy.
402 drivers/of/base.c | 2 ++
403 1 file changed, 2 insertions(+)
404 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
405 $ git merge spi-current/spi/merge
406 Auto-merging drivers/spi/spi.c
407 Auto-merging drivers/spi/spi-s3c64xx.c
408 Auto-merging drivers/spi/spi-bcm63xx.c
409 Merge made by the 'recursive' strategy.
410 drivers/spi/spi-bcm63xx.c | 16 ++++++----------
411 drivers/spi/spi-s3c64xx.c | 10 ++++------
412 drivers/spi/spi.c | 5 ++++-
413 3 files changed, 14 insertions(+), 17 deletions(-)
414 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
415 $ git merge gpio-current/gpio/merge
417 Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
418 $ git merge asm-generic/master
419 Merge made by the 'recursive' strategy.
420 arch/openrisc/include/asm/io.h | 1 +
421 include/asm-generic/io.h | 1 -
422 2 files changed, 1 insertion(+), 1 deletion(-)
423 Merging arm/for-next (4a83d2e Merge remote-tracking branch 'wildea/asids' into for-next)
424 $ git merge arm/for-next
425 Merge made by the 'recursive' strategy.
426 arch/arm/common/vic.c | 18 +-
427 arch/arm/include/asm/hardware/cache-l2x0.h | 5 +
428 arch/arm/include/asm/hardware/vic.h | 2 +-
429 arch/arm/include/asm/mmu.h | 11 +-
430 arch/arm/include/asm/mmu_context.h | 82 +-------
431 arch/arm/kernel/process.c | 1 +
432 arch/arm/mm/cache-aurora-l2.h | 55 ++++++
433 arch/arm/mm/cache-l2x0.c | 277 +++++++++++++++++++++++++---
434 arch/arm/mm/context.c | 207 +++++++++++----------
435 arch/arm/mm/proc-v7.S | 2 +-
436 drivers/mmc/host/mmci.c | 40 ++--
437 11 files changed, 456 insertions(+), 244 deletions(-)
438 create mode 100644 arch/arm/mm/cache-aurora-l2.h
439 Merging arm-perf/for-next/perf (b481680 Merge branch 'hw-breakpoint' into for-next/perf)
440 $ git merge arm-perf/for-next/perf
441 Auto-merging arch/arm/kernel/perf_event.c
442 Merge made by the 'recursive' strategy.
443 arch/arm/include/asm/hw_breakpoint.h | 8 +-
444 arch/arm/include/asm/perf_event.h | 5 +
445 arch/arm/include/asm/pmu.h | 28 ++--
446 arch/arm/kernel/hw_breakpoint.c | 154 +++++++++++----------
447 arch/arm/kernel/perf_event.c | 84 ++++++++----
448 arch/arm/kernel/perf_event_cpu.c | 74 ++++++----
449 arch/arm/kernel/perf_event_v6.c | 126 ++++++++---------
450 arch/arm/kernel/perf_event_v7.c | 246 ++++++++++++++++------------------
451 arch/arm/kernel/perf_event_xscale.c | 157 +++++++++++-----------
452 9 files changed, 473 insertions(+), 409 deletions(-)
453 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
454 $ git merge davinci/davinci-next
456 Merging xilinx/arm-next (6f0c058 Linux 3.7-rc2)
457 $ git merge xilinx/arm-next
459 Merging arm64/upstream (1e4097b arm64: Make the user fault reporting more specific)
460 $ git merge arm64/upstream
461 Merge made by the 'recursive' strategy.
462 Documentation/arm64/memory.txt | 12 ++++++------
463 arch/arm64/include/asm/io.h | 8 ++++----
464 arch/arm64/mm/fault.c | 13 +++++++++++--
465 3 files changed, 21 insertions(+), 12 deletions(-)
466 Merging blackfin/for-linus (cdc0584 Blackfin: twi: Add missing __iomem annotation)
467 $ git merge blackfin/for-linus
468 Removing arch/blackfin/include/asm/kvm_para.h
469 Merge made by the 'recursive' strategy.
470 arch/blackfin/include/asm/Kbuild | 6 +-
471 arch/blackfin/include/asm/bfin_sport.h | 128 +-----
472 arch/blackfin/include/asm/bfin_twi.h | 2 +-
473 arch/blackfin/include/asm/fixed_code.h | 30 +-
474 arch/blackfin/include/asm/kvm_para.h | 1 -
475 arch/blackfin/include/asm/ptrace.h | 161 +-------
476 arch/blackfin/include/asm/uaccess.h | 24 +-
477 arch/blackfin/include/asm/unistd.h | 430 +------------------
478 arch/blackfin/include/uapi/asm/Kbuild | 16 +
479 arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
480 arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
481 arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
482 arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
483 arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
484 arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
485 arch/blackfin/include/{ => uapi}/asm/poll.h | 0
486 arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
487 arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
488 arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
489 arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
490 arch/blackfin/include/{ => uapi}/asm/signal.h | 0
491 arch/blackfin/include/{ => uapi}/asm/stat.h | 0
492 arch/blackfin/include/{ => uapi}/asm/swab.h | 0
493 arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
494 24 files changed, 816 insertions(+), 763 deletions(-)
495 delete mode 100644 arch/blackfin/include/asm/kvm_para.h
496 create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
497 rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
498 rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
499 rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
500 create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
501 rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
502 rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
503 rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
504 create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
505 rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
506 rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
507 rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
508 rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
509 rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
510 create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
511 Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
512 $ git merge c6x/for-linux-next
514 Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
515 $ git merge cris/for-next
516 Auto-merging arch/cris/include/asm/Kbuild
517 Merge made by the 'recursive' strategy.
518 arch/cris/include/arch-v10/arch/Kbuild | 5 +-
519 arch/cris/include/arch-v32/arch/Kbuild | 3 +-
520 arch/cris/include/arch-v32/arch/cryptocop.h | 116 +------
521 arch/cris/include/arch-v32/arch/spinlock.h | 2 +-
522 arch/cris/include/asm/Kbuild | 5 -
523 arch/cris/include/asm/ptrace.h | 5 +-
524 arch/cris/include/asm/signal.h | 122 +------
525 arch/cris/include/asm/swab.h | 3 +-
526 arch/cris/include/asm/termios.h | 43 +--
527 arch/cris/include/asm/types.h | 5 +-
528 arch/cris/include/asm/unistd.h | 342 +------------------
529 arch/cris/include/uapi/arch-v10/arch/Kbuild | 4 +
530 .../include/{ => uapi}/arch-v10/arch/sv_addr.agh | 0
531 .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h | 0
532 .../cris/include/{ => uapi}/arch-v10/arch/svinto.h | 0
533 arch/cris/include/{ => uapi}/arch-v10/arch/user.h | 0
534 arch/cris/include/uapi/arch-v32/arch/Kbuild | 2 +
535 arch/cris/include/uapi/arch-v32/arch/cryptocop.h | 122 +++++++
536 arch/cris/include/{ => uapi}/arch-v32/arch/user.h | 0
537 arch/cris/include/uapi/asm/Kbuild | 34 ++
538 arch/cris/include/{ => uapi}/asm/auxvec.h | 0
539 arch/cris/include/{ => uapi}/asm/bitsperlong.h | 0
540 arch/cris/include/{ => uapi}/asm/byteorder.h | 0
541 arch/cris/include/{ => uapi}/asm/errno.h | 0
542 arch/cris/include/{ => uapi}/asm/ethernet.h | 0
543 arch/cris/include/{ => uapi}/asm/etraxgpio.h | 0
544 arch/cris/include/{ => uapi}/asm/fcntl.h | 0
545 arch/cris/include/{ => uapi}/asm/ioctl.h | 0
546 arch/cris/include/{ => uapi}/asm/ioctls.h | 0
547 arch/cris/include/{ => uapi}/asm/ipcbuf.h | 0
548 arch/cris/include/{ => uapi}/asm/mman.h | 0
549 arch/cris/include/{ => uapi}/asm/msgbuf.h | 0
550 arch/cris/include/{ => uapi}/asm/param.h | 0
551 arch/cris/include/{ => uapi}/asm/poll.h | 0
552 arch/cris/include/{ => uapi}/asm/posix_types.h | 0
553 arch/cris/include/uapi/asm/ptrace.h | 1 +
554 arch/cris/include/{ => uapi}/asm/resource.h | 0
555 arch/cris/include/{ => uapi}/asm/rs485.h | 0
556 arch/cris/include/{ => uapi}/asm/sembuf.h | 0
557 arch/cris/include/{ => uapi}/asm/setup.h | 0
558 arch/cris/include/{ => uapi}/asm/shmbuf.h | 0
559 arch/cris/include/{ => uapi}/asm/sigcontext.h | 0
560 arch/cris/include/{ => uapi}/asm/siginfo.h | 0
561 arch/cris/include/uapi/asm/signal.h | 122 +++++++
562 arch/cris/include/{ => uapi}/asm/socket.h | 0
563 arch/cris/include/{ => uapi}/asm/sockios.h | 0
564 arch/cris/include/{ => uapi}/asm/stat.h | 0
565 arch/cris/include/{ => uapi}/asm/statfs.h | 0
566 arch/cris/include/uapi/asm/swab.h | 3 +
567 arch/cris/include/{ => uapi}/asm/sync_serial.h | 0
568 arch/cris/include/{ => uapi}/asm/termbits.h | 0
569 arch/cris/include/uapi/asm/termios.h | 45 +++
570 arch/cris/include/uapi/asm/types.h | 1 +
571 arch/cris/include/uapi/asm/unistd.h | 344 ++++++++++++++++++++
572 arch/cris/kernel/asm-offsets.c | 6 +-
573 55 files changed, 689 insertions(+), 646 deletions(-)
574 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
575 rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
576 rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
577 rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
578 create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
579 rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
580 rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
581 rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
582 rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
583 rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
584 rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
585 rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
586 rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
587 rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
588 rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
589 rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
590 rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
591 rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
592 rename arch/cris/include/{ => uapi}/asm/param.h (100%)
593 rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
594 rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
595 create mode 100644 arch/cris/include/uapi/asm/ptrace.h
596 rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
597 rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
598 rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
599 rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
600 rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
601 rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
602 rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
603 create mode 100644 arch/cris/include/uapi/asm/signal.h
604 rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
605 rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
606 rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
607 rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
608 create mode 100644 arch/cris/include/uapi/asm/swab.h
609 rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
610 rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
611 create mode 100644 arch/cris/include/uapi/asm/termios.h
612 create mode 100644 arch/cris/include/uapi/asm/types.h
613 create mode 100644 arch/cris/include/uapi/asm/unistd.h
614 Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
615 $ git merge hexagon/linux-next
617 Merging ia64/next (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next)
618 $ git merge ia64/next
620 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
621 $ git merge m68k/for-next
623 Merging m68knommu/for-next (165d4c9 m68knommu: disable MC68000 cpu target when MMU is selected)
624 $ git merge m68knommu/for-next
625 Removing arch/m68k/platform/68VZ328/Makefile
626 Removing arch/m68k/platform/68EZ328/Makefile
627 Removing arch/m68k/platform/68328/head-rom.S
628 Removing arch/m68k/platform/68328/head-ram.S
629 Removing arch/m68k/platform/68328/head-pilot.S
630 Removing arch/m68k/platform/68328/head-de2.S
631 Removing arch/m68k/platform/68328/Makefile
632 Auto-merging arch/m68k/platform/68000/timers.c
633 Auto-merging arch/m68k/platform/68000/romvec.S
634 Auto-merging arch/m68k/platform/68000/m68VZ328.c
635 Auto-merging arch/m68k/platform/68000/m68EZ328.c
636 Auto-merging arch/m68k/platform/68000/m68328.c
637 Auto-merging arch/m68k/platform/68000/ints.c
638 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.
639 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.
640 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.
641 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.
642 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.
643 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.
644 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.
645 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.
646 Removing arch/m68k/include/asm/spinlock.h
647 Removing arch/m68k/include/asm/shmparam.h
648 Removing arch/m68k/include/asm/hw_irq.h
649 Auto-merging arch/m68k/include/asm/Kbuild
650 Automatic merge failed; fix conflicts and then commit the result.
651 $ 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
652 arch/m68k/include/asm/termios.h: needs merge
653 arch/m68k/include/uapi/asm/auxvec.h: needs merge
654 arch/m68k/include/uapi/asm/msgbuf.h: needs merge
655 arch/m68k/include/uapi/asm/sembuf.h: needs merge
656 arch/m68k/include/uapi/asm/shmbuf.h: needs merge
657 arch/m68k/include/uapi/asm/socket.h: needs merge
658 arch/m68k/include/uapi/asm/sockios.h: needs merge
659 arch/m68k/include/uapi/asm/termbits.h: needs merge
660 rm 'arch/m68k/include/asm/termios.h'
661 rm 'arch/m68k/include/uapi/asm/auxvec.h'
662 rm 'arch/m68k/include/uapi/asm/msgbuf.h'
663 rm 'arch/m68k/include/uapi/asm/sembuf.h'
664 rm 'arch/m68k/include/uapi/asm/shmbuf.h'
665 rm 'arch/m68k/include/uapi/asm/socket.h'
666 rm 'arch/m68k/include/uapi/asm/sockios.h'
667 rm 'arch/m68k/include/uapi/asm/termbits.h'
669 [master aef8025] Merge remote-tracking branch 'm68knommu/for-next'
670 $ git diff -M --stat --summary HEAD^..
671 arch/m68k/Kconfig.cpu | 3 +-
672 arch/m68k/Makefile | 6 +-
673 arch/m68k/include/asm/Kbuild | 11 +
674 arch/m68k/include/asm/hw_irq.h | 6 -
675 arch/m68k/include/asm/shmparam.h | 6 -
676 arch/m68k/include/asm/spinlock.h | 6 -
677 arch/m68k/include/asm/termios.h | 50 ----
678 arch/m68k/include/uapi/asm/auxvec.h | 4 -
679 arch/m68k/include/uapi/asm/msgbuf.h | 31 ---
680 arch/m68k/include/uapi/asm/sembuf.h | 25 --
681 arch/m68k/include/uapi/asm/shmbuf.h | 42 ----
682 arch/m68k/include/uapi/asm/socket.h | 72 ------
683 arch/m68k/include/uapi/asm/sockios.h | 13 --
684 arch/m68k/include/uapi/asm/termbits.h | 201 ----------------
685 arch/m68k/platform/68000/Makefile | 18 ++
686 .../{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} | 0
687 arch/m68k/platform/{68328 => 68000}/bootlogo.h | 0
688 arch/m68k/platform/{68328 => 68000}/entry.S | 0
689 arch/m68k/platform/68000/head.S | 240 ++++++++++++++++++++
690 arch/m68k/platform/{68328 => 68000}/ints.c | 2 +-
691 .../platform/{68328/config.c => 68000/m68328.c} | 2 +-
692 .../{68EZ328/config.c => 68000/m68EZ328.c} | 2 +-
693 .../{68VZ328/config.c => 68000/m68VZ328.c} | 4 +-
694 arch/m68k/platform/{68328 => 68000}/romvec.S | 2 +-
695 arch/m68k/platform/{68328 => 68000}/timers.c | 2 +-
696 arch/m68k/platform/68328/Makefile | 21 --
697 arch/m68k/platform/68328/head-de2.S | 128 -----------
698 arch/m68k/platform/68328/head-pilot.S | 207 -----------------
699 arch/m68k/platform/68328/head-ram.S | 141 ------------
700 arch/m68k/platform/68328/head-rom.S | 105 ---------
701 arch/m68k/platform/68EZ328/Makefile | 5 -
702 arch/m68k/platform/68VZ328/Makefile | 5 -
703 32 files changed, 280 insertions(+), 1080 deletions(-)
704 delete mode 100644 arch/m68k/include/asm/hw_irq.h
705 delete mode 100644 arch/m68k/include/asm/shmparam.h
706 delete mode 100644 arch/m68k/include/asm/spinlock.h
707 delete mode 100644 arch/m68k/include/asm/termios.h
708 delete mode 100644 arch/m68k/include/uapi/asm/auxvec.h
709 delete mode 100644 arch/m68k/include/uapi/asm/msgbuf.h
710 delete mode 100644 arch/m68k/include/uapi/asm/sembuf.h
711 delete mode 100644 arch/m68k/include/uapi/asm/shmbuf.h
712 delete mode 100644 arch/m68k/include/uapi/asm/socket.h
713 delete mode 100644 arch/m68k/include/uapi/asm/sockios.h
714 delete mode 100644 arch/m68k/include/uapi/asm/termbits.h
715 create mode 100644 arch/m68k/platform/68000/Makefile
716 rename arch/m68k/platform/{68VZ328/bootlogo.h => 68000/bootlogo-vz.h} (100%)
717 rename arch/m68k/platform/{68328 => 68000}/bootlogo.h (100%)
718 rename arch/m68k/platform/{68328 => 68000}/entry.S (100%)
719 create mode 100644 arch/m68k/platform/68000/head.S
720 rename arch/m68k/platform/{68328 => 68000}/ints.c (98%)
721 rename arch/m68k/platform/{68328/config.c => 68000/m68328.c} (97%)
722 rename arch/m68k/platform/{68EZ328/config.c => 68000/m68EZ328.c} (97%)
723 rename arch/m68k/platform/{68VZ328/config.c => 68000/m68VZ328.c} (98%)
724 rename arch/m68k/platform/{68328 => 68000}/romvec.S (94%)
725 rename arch/m68k/platform/{68328 => 68000}/timers.c (98%)
726 delete mode 100644 arch/m68k/platform/68328/Makefile
727 delete mode 100644 arch/m68k/platform/68328/head-de2.S
728 delete mode 100644 arch/m68k/platform/68328/head-pilot.S
729 delete mode 100644 arch/m68k/platform/68328/head-ram.S
730 delete mode 100644 arch/m68k/platform/68328/head-rom.S
731 delete mode 100644 arch/m68k/platform/68EZ328/Makefile
732 delete mode 100644 arch/m68k/platform/68VZ328/Makefile
733 $ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch
734 Applying: m68k: fix up for UAPI changes
736 Unstaged changes after reset:
737 M arch/m68k/include/uapi/asm/Kbuild
739 $ git commit -v -a --amend
740 [master 827cdb0] Merge remote-tracking branch 'm68knommu/for-next'
741 Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
742 $ git merge microblaze/next
743 Auto-merging arch/microblaze/include/asm/Kbuild
744 Merge made by the 'recursive' strategy.
745 arch/microblaze/include/asm/Kbuild | 2 -
746 arch/microblaze/include/asm/elf.h | 97 +----
747 arch/microblaze/include/asm/ptrace.h | 62 +--
748 arch/microblaze/include/asm/setup.h | 6 +-
749 arch/microblaze/include/asm/unistd.h | 390 +------------------
750 arch/microblaze/include/uapi/asm/Kbuild | 32 ++
751 arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
752 .../include/{ => uapi}/asm/bitsperlong.h | 0
753 arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
754 arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
755 arch/microblaze/include/{ => uapi}/asm/errno.h | 0
756 arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
757 arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
758 arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
759 arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
760 arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
761 arch/microblaze/include/{ => uapi}/asm/mman.h | 0
762 arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
763 arch/microblaze/include/{ => uapi}/asm/param.h | 0
764 arch/microblaze/include/{ => uapi}/asm/poll.h | 0
765 .../include/{ => uapi}/asm/posix_types.h | 0
766 arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
767 arch/microblaze/include/{ => uapi}/asm/resource.h | 0
768 arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
769 arch/microblaze/include/uapi/asm/setup.h | 19 +
770 arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
771 .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
772 arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
773 arch/microblaze/include/{ => uapi}/asm/signal.h | 0
774 arch/microblaze/include/{ => uapi}/asm/socket.h | 0
775 arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
776 arch/microblaze/include/{ => uapi}/asm/stat.h | 0
777 arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
778 arch/microblaze/include/{ => uapi}/asm/swab.h | 0
779 arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
780 arch/microblaze/include/{ => uapi}/asm/termios.h | 0
781 arch/microblaze/include/{ => uapi}/asm/types.h | 0
782 arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
783 38 files changed, 649 insertions(+), 552 deletions(-)
784 rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
785 rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
786 rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
787 create mode 100644 arch/microblaze/include/uapi/asm/elf.h
788 rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
789 rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
790 rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
791 rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
792 rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
793 rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
794 rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
795 rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
796 rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
797 rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
798 rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
799 create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
800 rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
801 rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
802 create mode 100644 arch/microblaze/include/uapi/asm/setup.h
803 rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
804 rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
805 rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
806 rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
807 rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
808 rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
809 rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
810 rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
811 rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
812 rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
813 rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
814 rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
815 create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
816 Merging mips/mips-for-linux-next (1996e38 MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set.)
817 $ git merge mips/mips-for-linux-next
818 Auto-merging MAINTAINERS
819 Merge made by the 'recursive' strategy.
821 arch/mips/Kconfig | 17 ++-
822 arch/mips/cavium-octeon/octeon-memcpy.S | 27 -----
823 arch/mips/cavium-octeon/setup.c | 40 +++++--
824 arch/mips/configs/cavium_octeon_defconfig | 98 ++++++++++++++---
825 arch/mips/include/asm/cpu.h | 6 +-
826 arch/mips/include/asm/mipsregs.h | 2 +-
827 arch/mips/include/asm/page.h | 8 +-
828 arch/mips/include/asm/pgtable-64.h | 2 +-
829 arch/mips/include/asm/pgtable-bits.h | 13 ++-
830 arch/mips/include/asm/pgtable.h | 168 ++++++++++++++++++++++++++++-
831 arch/mips/include/asm/sparsemem.h | 2 +-
832 arch/mips/include/asm/tlbdebug.h | 1 +
833 arch/mips/kernel/mips_ksyms.c | 2 +-
834 arch/mips/kernel/scall64-n32.S | 6 --
835 arch/mips/lib/dump_tlb.c | 47 ++++++++
836 arch/mips/mm/c-octeon.c | 46 ++++----
837 arch/mips/mm/pgtable-64.c | 31 ++++++
838 arch/mips/mm/tlb-r4k.c | 22 +++-
839 arch/mips/mm/tlbex.c | 91 +++++++++++-----
840 arch/mips/pci/pci-octeon.c | 4 +
841 drivers/edac/Kconfig | 33 +++++-
842 drivers/edac/Makefile | 5 +
843 drivers/edac/octeon_edac-l2c.c | 118 ++++++++++++++++++++
844 drivers/edac/octeon_edac-lmc.c | 150 ++++++++++++++++++++++++++
845 drivers/edac/octeon_edac-lmc.h | 78 ++++++++++++++
846 drivers/edac/octeon_edac-pc.c | 140 ++++++++++++++++++++++++
847 drivers/edac/octeon_edac-pci.c | 135 +++++++++++++++++++++++
848 28 files changed, 1172 insertions(+), 129 deletions(-)
849 create mode 100644 drivers/edac/octeon_edac-l2c.c
850 create mode 100644 drivers/edac/octeon_edac-lmc.c
851 create mode 100644 drivers/edac/octeon_edac-lmc.h
852 create mode 100644 drivers/edac/octeon_edac-pc.c
853 create mode 100644 drivers/edac/octeon_edac-pci.c
854 Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
855 $ git merge openrisc/for-upstream
856 Removing arch/openrisc/include/uapi/asm/kvm_para.h
857 Merge made by the 'recursive' strategy.
858 arch/openrisc/include/asm/Kbuild | 1 +
859 arch/openrisc/include/uapi/asm/kvm_para.h | 1 -
860 arch/openrisc/kernel/asm-offsets.c | 6 +-----
861 3 files changed, 2 insertions(+), 6 deletions(-)
862 delete mode 100644 arch/openrisc/include/uapi/asm/kvm_para.h
863 Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
864 $ git merge parisc/for-next
866 Merge made by the 'recursive' strategy.
867 Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
868 $ git merge powerpc/next
870 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
873 Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
874 $ git merge mpc5xxx/next
875 Merge made by the 'recursive' strategy.
876 arch/powerpc/boot/dts/mpc5200b.dtsi | 6 ++++++
877 arch/powerpc/boot/dts/o2d.dtsi | 6 ------
878 arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
879 arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +++++----
880 4 files changed, 17 insertions(+), 11 deletions(-)
881 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
882 $ git merge galak/next
884 Merging s390/features (2845a77 s390/crypto: Don't panic after crypto instruction failures)
885 $ git merge s390/features
886 Merge made by the 'recursive' strategy.
887 arch/s390/crypto/aes_s390.c | 18 +++--
888 arch/s390/crypto/des_s390.c | 12 ++--
889 arch/s390/crypto/ghash_s390.c | 21 +++---
890 arch/s390/crypto/sha_common.c | 9 ++-
891 arch/s390/include/asm/pgtable.h | 45 ++++++++----
892 arch/s390/kernel/Makefile | 2 +-
893 arch/s390/kernel/entry.h | 21 +++++-
894 arch/s390/kernel/entry64.S | 4 +-
895 arch/s390/kernel/pgm_check.S | 152 +++++++++++++++++++++++++++++++++++++++
896 arch/s390/kernel/traps.c | 52 ++------------
897 arch/s390/lib/uaccess_pt.c | 2 +-
898 arch/s390/mm/dump_pagetables.c | 7 +-
899 arch/s390/mm/gup.c | 2 +-
900 arch/s390/mm/pageattr.c | 2 +-
901 arch/s390/mm/vmem.c | 46 ++++++++++--
902 drivers/s390/block/dasd_eckd.c | 76 ++++++++++----------
903 drivers/s390/block/dasd_fba.c | 23 +++---
904 drivers/s390/cio/device.c | 8 +--
905 drivers/s390/cio/qdio_main.c | 52 +++-----------
906 drivers/s390/cio/qdio_setup.c | 4 +-
907 drivers/s390/cio/qdio_thinint.c | 2 -
908 21 files changed, 364 insertions(+), 196 deletions(-)
909 create mode 100644 arch/s390/kernel/pgm_check.S
910 Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
911 $ git merge sh/sh-latest
913 Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
914 $ git merge sparc-next/master
916 Merging tile/master (ddffeb8 Linux 3.7-rc1)
917 $ git merge tile/master
919 Merging unicore32/unicore32 (5d05622 unicore32: switch to generic sys_execve())
920 $ git merge unicore32/unicore32
921 Auto-merging arch/unicore32/include/uapi/asm/unistd.h
922 Removing arch/unicore32/include/asm/kvm_para.h
923 Merge made by the 'recursive' strategy.
924 arch/unicore32/Kconfig | 5 ++
925 arch/unicore32/include/asm/Kbuild | 1 -
926 arch/unicore32/include/asm/bug.h | 5 --
927 arch/unicore32/include/asm/cmpxchg.h | 2 +-
928 arch/unicore32/include/asm/kvm_para.h | 1 -
929 arch/unicore32/include/asm/processor.h | 5 --
930 arch/unicore32/include/asm/ptrace.h | 76 +----------------
931 arch/unicore32/include/uapi/asm/Kbuild | 7 ++
932 arch/unicore32/include/{ => uapi}/asm/byteorder.h | 0
933 arch/unicore32/include/uapi/asm/ptrace.h | 90 ++++++++++++++++++++
934 arch/unicore32/include/{ => uapi}/asm/sigcontext.h | 0
935 arch/unicore32/include/{ => uapi}/asm/unistd.h | 1 +
936 arch/unicore32/kernel/entry.S | 20 ++---
937 arch/unicore32/kernel/process.c | 58 +++----------
938 arch/unicore32/kernel/setup.h | 6 ++
939 arch/unicore32/kernel/sys.c | 63 --------------
940 arch/unicore32/mm/fault.c | 37 +++++---
941 17 files changed, 159 insertions(+), 218 deletions(-)
942 delete mode 100644 arch/unicore32/include/asm/kvm_para.h
943 rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
944 create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
945 rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
946 rename arch/unicore32/include/{ => uapi}/asm/unistd.h (92%)
947 Merging xtensa/for_next (dc241f2 xtensa: switch to generic sys_execve())
948 $ git merge xtensa/for_next
949 Merge made by the 'recursive' strategy.
950 arch/xtensa/Kconfig | 2 +
951 arch/xtensa/include/asm/io.h | 4 ++
952 arch/xtensa/include/asm/processor.h | 4 +-
953 arch/xtensa/include/asm/syscall.h | 2 +-
954 arch/xtensa/include/asm/unistd.h | 15 ++--
955 arch/xtensa/include/uapi/asm/unistd.h | 16 ++---
956 arch/xtensa/kernel/entry.S | 57 ++++-----------
957 arch/xtensa/kernel/process.c | 128 ++++++++++++++++++---------------
958 arch/xtensa/kernel/syscall.c | 7 +-
959 arch/xtensa/kernel/xtensa_ksyms.c | 1 -
960 10 files changed, 104 insertions(+), 132 deletions(-)
961 Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
962 $ git merge btrfs/next
964 Merging ceph/master (3515297 rbd: activate v2 image support)
965 $ git merge ceph/master
966 Merge made by the 'recursive' strategy.
967 drivers/block/rbd.c | 100 +++++++++++++++++++++++++++++++++++++++-----------
968 net/ceph/messenger.c | 61 ++++++++++++++----------------
969 2 files changed, 106 insertions(+), 55 deletions(-)
970 Merging cifs/for-next (f51de01 cifs: extra sanity checking for cifs.idmap keys)
971 $ git merge cifs/for-next
972 Merge made by the 'recursive' strategy.
973 fs/cifs/cifsacl.c | 749 +++++++++++++++------------------------------------
974 fs/cifs/cifsacl.h | 53 ++--
975 fs/cifs/cifsfs.c | 12 +-
976 fs/cifs/cifsproto.h | 1 -
977 fs/cifs/inode.c | 7 +-
978 fs/cifs/readdir.c | 10 +
979 6 files changed, 258 insertions(+), 574 deletions(-)
980 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
981 $ git merge configfs/linux-next
983 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
984 $ git merge ecryptfs/next
986 Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
987 $ git merge ext3/for_next
989 Merging ext4/dev (5de35e8 ext4: Avoid underflow in ext4_trim_fs())
992 Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
993 $ git merge fuse/for-next
994 Auto-merging include/uapi/linux/fuse.h
995 Auto-merging fs/fuse/inode.c
996 Auto-merging fs/fuse/dev.c
997 Merge made by the 'recursive' strategy.
999 fs/fuse/Kconfig | 16 ++++-
1000 fs/fuse/dev.c | 19 ++++++
1001 fs/fuse/dir.c | 160 +++++++++++++++++++++++++++++++++++++++++++--
1002 fs/fuse/fuse_i.h | 6 ++
1003 fs/fuse/inode.c | 5 +-
1004 include/uapi/linux/fuse.h | 12 ++++
1005 7 files changed, 211 insertions(+), 17 deletions(-)
1006 Merging gfs2/master (a86888e GFS2: Rename glops go_xmote_th to go_sync)
1007 $ git merge gfs2/master
1008 Merge made by the 'recursive' strategy.
1009 fs/gfs2/file.c | 2 --
1010 fs/gfs2/glock.c | 14 ++++++-------
1011 fs/gfs2/glock.h | 54 +++++++++++++++++++++++++-------------------------
1012 fs/gfs2/glops.c | 16 +++++++--------
1013 fs/gfs2/incore.h | 3 ++-
1014 fs/gfs2/lops.c | 2 --
1015 fs/gfs2/ops_fstype.c | 3 +++
1016 fs/gfs2/quota.c | 7 +++++--
1017 fs/gfs2/rgrp.c | 54 ++++++++++++++++++++++++++++++--------------------
1018 9 files changed, 84 insertions(+), 71 deletions(-)
1019 Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
1020 $ git merge jfs/jfs-next
1022 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
1023 $ git merge logfs/master
1024 Merge made by the 'recursive' strategy.
1025 fs/logfs/dev_mtd.c | 2 +-
1026 1 file changed, 1 insertion(+), 1 deletion(-)
1027 Merging nfs/linux-next (831f548 SUNRPC: Introduce the 'rpc_fence_lock')
1028 $ git merge nfs/linux-next
1029 Merge made by the 'recursive' strategy.
1030 fs/lockd/clnt4xdr.c | 8 ---
1031 fs/lockd/clntproc.c | 3 +-
1032 fs/lockd/clntxdr.c | 8 ---
1033 fs/lockd/host.c | 15 ++---
1034 fs/lockd/mon.c | 3 -
1035 fs/nfs/cache_lib.c | 1 -
1036 fs/nfs/callback_proc.c | 1 -
1037 fs/nfs/client.c | 6 +-
1038 fs/nfs/inode.c | 4 +-
1039 fs/nfs/mount_clnt.c | 7 +-
1040 fs/nfs/nfs2xdr.c | 4 +-
1041 fs/nfs/nfs3xdr.c | 7 +-
1042 fs/nfs/nfs4_fs.h | 1 +
1043 fs/nfs/nfs4client.c | 4 --
1044 fs/nfs/nfs4file.c | 1 -
1045 fs/nfs/nfs4filelayout.c | 37 +++--------
1046 fs/nfs/nfs4filelayoutdev.c | 2 -
1047 fs/nfs/nfs4proc.c | 150 ++++++++++++++----------------------------
1048 fs/nfs/nfs4state.c | 1 -
1049 fs/nfs/nfs4xdr.c | 6 +-
1050 fs/nfs/objlayout/objlayout.c | 11 ----
1051 fs/nfs/pnfs.c | 17 +----
1052 fs/nfs/write.c | 26 +++-----
1053 include/linux/sunrpc/sched.h | 28 ++++++++
1054 net/sunrpc/sched.c | 122 +++++++++++++++++++++++++++++++++-
1055 25 files changed, 242 insertions(+), 231 deletions(-)
1056 Merging nfsd/nfsd-next (ddffeb8 Linux 3.7-rc1)
1057 $ git merge nfsd/nfsd-next
1059 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
1060 $ git merge ocfs2/linux-next
1061 Auto-merging fs/ocfs2/cluster/heartbeat.c
1062 Merge made by the 'recursive' strategy.
1063 fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
1064 fs/ocfs2/cluster/masklog.h | 3 ++-
1065 fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
1066 fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
1067 fs/ocfs2/symlink.c | 2 +-
1068 5 files changed, 27 insertions(+), 35 deletions(-)
1069 Merging omfs/for-next (976d167 Linux 3.1-rc9)
1070 $ git merge omfs/for-next
1072 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
1073 $ git merge squashfs/master
1075 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
1076 $ git merge v9fs/for-next
1077 Merge made by the 'recursive' strategy.
1078 Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
1079 $ git merge ubifs/linux-next
1080 Merge made by the 'recursive' strategy.
1081 fs/ubifs/find.c | 12 ++++++++++--
1082 fs/ubifs/lprops.c | 6 ++++++
1083 fs/ubifs/ubifs.h | 3 +++
1084 3 files changed, 19 insertions(+), 2 deletions(-)
1085 Merging xfs/for-next (e04426b xfs: move allocation stack switch up to xfs_bmapi_allocate)
1086 $ git merge xfs/for-next
1087 Removing fs/xfs/xfs_iget.c
1088 Auto-merging fs/xfs/xfs_icache.h
1089 Auto-merging fs/xfs/xfs_icache.c
1090 Merge made by the 'recursive' strategy.
1091 fs/xfs/Makefile | 3 +-
1092 fs/xfs/xfs_alloc.c | 43 +--
1093 fs/xfs/xfs_alloc.h | 3 -
1094 fs/xfs/xfs_bmap.c | 63 +++-
1095 fs/xfs/xfs_bmap.h | 9 +-
1096 fs/xfs/xfs_export.c | 1 +
1097 fs/xfs/xfs_file.c | 13 +-
1098 fs/xfs/xfs_ialloc.c | 1 +
1099 fs/xfs/{xfs_sync.c => xfs_icache.c} | 701 ++++++++++++++++++++--------------
1100 fs/xfs/{xfs_sync.h => xfs_icache.h} | 14 +-
1101 fs/xfs/xfs_iget.c | 705 -----------------------------------
1102 fs/xfs/xfs_inode.c | 251 +++++++++++++
1103 fs/xfs/xfs_inode.h | 10 +-
1104 fs/xfs/xfs_iomap.c | 27 +-
1105 fs/xfs/xfs_itable.c | 1 +
1106 fs/xfs/xfs_log.c | 122 +++++-
1107 fs/xfs/xfs_log.h | 4 +
1108 fs/xfs/xfs_log_priv.h | 1 +
1109 fs/xfs/xfs_log_recover.c | 1 +
1110 fs/xfs/xfs_mount.c | 31 +-
1111 fs/xfs/xfs_mount.h | 6 +-
1112 fs/xfs/xfs_qm.c | 1 +
1113 fs/xfs/xfs_qm_syscalls.c | 1 +
1114 fs/xfs/xfs_rtalloc.c | 1 +
1115 fs/xfs/xfs_super.c | 139 ++++---
1116 fs/xfs/xfs_super.h | 1 +
1117 fs/xfs/xfs_vnodeops.c | 3 +-
1118 27 files changed, 987 insertions(+), 1169 deletions(-)
1119 rename fs/xfs/{xfs_sync.c => xfs_icache.c} (64%)
1120 rename fs/xfs/{xfs_sync.h => xfs_icache.h} (73%)
1121 delete mode 100644 fs/xfs/xfs_iget.c
1122 Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
1123 $ git merge vfs/for-next
1124 Auto-merging arch/alpha/kernel/osf_sys.c
1125 Merge made by the 'recursive' strategy.
1126 arch/alpha/kernel/osf_sys.c | 6 +++---
1127 1 file changed, 3 insertions(+), 3 deletions(-)
1128 Merging pci/next (6f0c058 Linux 3.7-rc2)
1129 $ git merge pci/next
1131 Merging hid/for-next (5277e97 HID: roccat: allow readout of koneplus sensor register data)
1132 $ git merge hid/for-next
1133 Merge made by the 'recursive' strategy.
1134 .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 6 +-
1135 .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 +
1136 drivers/hid/Makefile | 4 +-
1137 drivers/hid/hid-core.c | 1 +
1138 drivers/hid/hid-ids.h | 1 +
1139 drivers/hid/hid-roccat-koneplus.c | 11 +-
1140 drivers/hid/hid-roccat-lua.c | 227 ++++++++++++++++++++
1141 drivers/hid/hid-roccat-lua.h | 29 +++
1142 8 files changed, 280 insertions(+), 6 deletions(-)
1143 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
1144 create mode 100644 drivers/hid/hid-roccat-lua.c
1145 create mode 100644 drivers/hid/hid-roccat-lua.h
1146 Merging quilt/i2c (71af1ef i2c: Mention functionality flags in SMBus protocol documentation)
1147 $ git merge quilt/i2c
1148 Auto-merging drivers/i2c/i2c-stub.c
1149 Merge made by the 'recursive' strategy.
1150 Documentation/i2c/smbus-protocol | 40 ++++++++++++++++-----
1151 drivers/i2c/Makefile | 1 +
1152 drivers/i2c/busses/Kconfig | 1 -
1153 drivers/i2c/busses/Makefile | 1 -
1154 drivers/i2c/busses/i2c-i801.c | 13 ++++---
1155 drivers/i2c/busses/i2c-piix4.c | 5 ++-
1156 drivers/i2c/{busses => }/i2c-stub.c | 66 +++++++++++++++++------------------
1157 7 files changed, 75 insertions(+), 52 deletions(-)
1158 rename drivers/i2c/{busses => }/i2c-stub.c (75%)
1159 Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
1160 $ git merge i2c-embedded/i2c-embedded/for-next
1162 Merging quilt/jdelvare-hwmon (1066e41 hwmon (w83627hf) Don't touch nonexistent I2C address registers)
1163 $ git merge quilt/jdelvare-hwmon
1164 Merge made by the 'recursive' strategy.
1165 drivers/hwmon/asb100.c | 2 +-
1166 drivers/hwmon/w83627ehf.c | 96 ++++++++++++++++++++++++++++++++++++++++++++-
1167 drivers/hwmon/w83627hf.c | 83 +++++++++++++++++++++++++++++++++++++--
1168 drivers/hwmon/w83781d.c | 2 +-
1169 drivers/hwmon/w83791d.c | 2 +-
1170 drivers/hwmon/w83792d.c | 2 +-
1171 drivers/hwmon/w83l786ng.c | 2 +-
1172 7 files changed, 179 insertions(+), 10 deletions(-)
1173 Merging hwmon-staging/hwmon-next (3d5d7f3 hwmon: DA9055 HWMON driver)
1174 $ git merge hwmon-staging/hwmon-next
1175 Merge made by the 'recursive' strategy.
1176 Documentation/hwmon/ads7828 | 46 +++--
1177 Documentation/hwmon/coretemp | 2 +
1178 Documentation/hwmon/da9055 | 47 +++++
1179 drivers/hwmon/Kconfig | 19 +-
1180 drivers/hwmon/Makefile | 1 +
1181 drivers/hwmon/ads7828.c | 247 ++++++++++--------------
1182 drivers/hwmon/coretemp.c | 60 +++---
1183 drivers/hwmon/da9052-hwmon.c | 27 +--
1184 drivers/hwmon/da9055-hwmon.c | 336 +++++++++++++++++++++++++++++++++
1185 drivers/hwmon/ina2xx.c | 13 +-
1186 include/linux/platform_data/ads7828.h | 29 +++
1187 11 files changed, 603 insertions(+), 224 deletions(-)
1188 create mode 100644 Documentation/hwmon/da9055
1189 create mode 100644 drivers/hwmon/da9055-hwmon.c
1190 create mode 100644 include/linux/platform_data/ads7828.h
1191 Merging v4l-dvb/master (ac5ce7c Merge /home/v4l/v4l/patchwork)
1192 $ git merge v4l-dvb/master
1193 Removing include/linux/dvb/video.h
1194 Removing include/linux/dvb/dmx.h
1195 Removing include/linux/dvb/Kbuild
1196 Auto-merging MAINTAINERS
1197 Merge made by the 'recursive' strategy.
1198 MAINTAINERS | 44 +++---
1199 drivers/media/common/Kconfig | 7 +
1200 drivers/media/common/b2c2/Kconfig | 5 -
1201 drivers/media/common/siano/Kconfig | 17 +--
1202 drivers/media/common/siano/Makefile | 3 +-
1203 drivers/media/common/siano/smscoreapi.c | 2 +-
1204 drivers/media/common/siano/smsir.c | 2 +-
1205 drivers/media/common/siano/smsir.h | 9 ++
1206 drivers/media/dvb-core/dmxdev.c | 2 +-
1207 drivers/media/dvb-core/dmxdev.h | 1 +
1208 drivers/media/dvb-core/dvb_frontend.c | 10 --
1209 drivers/media/dvb-frontends/cx22700.c | 4 +-
1210 drivers/media/dvb-frontends/cx24123.c | 2 +-
1211 drivers/media/dvb-frontends/dib9000.h | 2 +-
1212 drivers/media/dvb-frontends/drxd_hard.c | 8 +-
1213 drivers/media/dvb-frontends/drxk_hard.c | 23 +--
1214 drivers/media/dvb-frontends/drxk_hard.h | 6 +-
1215 drivers/media/dvb-frontends/l64781.c | 4 +-
1216 drivers/media/dvb-frontends/mt312.c | 4 +-
1217 drivers/media/dvb-frontends/rtl2830.c | 6 +-
1218 drivers/media/dvb-frontends/rtl2832.c | 6 +-
1219 drivers/media/dvb-frontends/stb0899_drv.c | 2 +-
1220 drivers/media/dvb-frontends/stv0367.c | 19 +--
1221 drivers/media/dvb-frontends/stv0900_core.c | 6 +-
1222 drivers/media/dvb-frontends/tda10071.c | 6 +-
1223 drivers/media/dvb-frontends/tda18271c2dd.c | 1 +
1224 drivers/media/firewire/firedtv.h | 1 +
1225 drivers/media/i2c/adv7183.c | 13 +-
1226 drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
1227 drivers/media/i2c/ir-kbd-i2c.c | 14 +-
1228 drivers/media/i2c/s5k4ecgx.c | 2 +-
1229 drivers/media/i2c/soc_camera/ov2640.c | 6 +-
1230 drivers/media/i2c/vs6624.c | 13 +-
1231 drivers/media/mmc/siano/Kconfig | 1 +
1232 drivers/media/pci/bt8xx/bttv-driver.c | 7 +-
1233 drivers/media/pci/cx18/cx18-alsa-main.c | 2 +-
1234 drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 +
1235 drivers/media/pci/cx18/cx18-i2c.c | 2 +-
1236 drivers/media/pci/cx18/cx18-streams.c | 2 +-
1237 drivers/media/pci/cx23885/altera-ci.c | 45 +++---
1238 drivers/media/pci/cx23885/cimax2.c | 17 ++-
1239 drivers/media/pci/cx23885/cx23885-alsa.c | 6 +-
1240 drivers/media/pci/cx23885/cx23885-av.c | 1 +
1241 drivers/media/pci/cx23885/cx23885-cards.c | 2 +-
1242 drivers/media/pci/cx23885/cx23885-core.c | 8 +-
1243 drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
1244 drivers/media/pci/cx23885/cx23885-f300.c | 1 +
1245 drivers/media/pci/cx23885/cx23885-input.c | 7 +-
1246 drivers/media/pci/cx23885/cx23885-input.h | 2 +-
1247 drivers/media/pci/cx23885/cx23885-ioctl.c | 2 +
1248 drivers/media/pci/cx23885/cx23885-ir.c | 1 +
1249 drivers/media/pci/cx23885/cx23888-ir.c | 1 +
1250 drivers/media/pci/cx23885/netup-init.c | 1 +
1251 drivers/media/pci/cx25821/cx25821-audio-upstream.c | 16 +--
1252 drivers/media/pci/cx25821/cx25821-biffuncs.h | 6 +-
1253 drivers/media/pci/cx25821/cx25821-i2c.c | 4 +-
1254 .../media/pci/cx25821/cx25821-video-upstream-ch2.c | 24 ++--
1255 drivers/media/pci/cx25821/cx25821-video-upstream.c | 32 +++--
1256 drivers/media/pci/cx25821/cx25821-video.c | 8 +-
1257 drivers/media/pci/cx88/cx88-alsa.c | 14 +-
1258 drivers/media/pci/cx88/cx88-blackbird.c | 7 +-
1259 drivers/media/pci/cx88/cx88-core.c | 12 +-
1260 drivers/media/pci/cx88/cx88-input.c | 8 +-
1261 drivers/media/pci/cx88/cx88-mpeg.c | 18 +--
1262 drivers/media/pci/cx88/cx88.h | 4 +-
1263 drivers/media/pci/dm1105/dm1105.c | 4 +-
1264 drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 +-
1265 drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 6 +-
1266 drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 4 -
1267 drivers/media/pci/ivtv/ivtv-firmware.c | 2 +-
1268 drivers/media/pci/ivtv/ivtv-i2c.c | 8 +-
1269 drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +-
1270 drivers/media/pci/mantis/mantis_input.c | 5 +-
1271 drivers/media/pci/mantis/mantis_uart.c | 2 +-
1272 drivers/media/pci/mantis/mantis_vp1033.c | 6 +-
1273 drivers/media/pci/meye/meye.c | 2 +-
1274 drivers/media/pci/ngene/ngene-cards.c | 4 +-
1275 drivers/media/pci/ngene/ngene-core.c | 4 +-
1276 drivers/media/pci/saa7134/saa7134-core.c | 3 +-
1277 drivers/media/pci/saa7134/saa7134-input.c | 2 +-
1278 drivers/media/pci/saa7134/saa7134-video.c | 2 +-
1279 drivers/media/pci/saa7164/saa7164-api.c | 26 ++--
1280 drivers/media/pci/saa7164/saa7164-bus.c | 6 +-
1281 drivers/media/pci/saa7164/saa7164-cmd.c | 16 +--
1282 drivers/media/pci/saa7164/saa7164-core.c | 4 +-
1283 drivers/media/pci/saa7164/saa7164-encoder.c | 15 +-
1284 drivers/media/pci/saa7164/saa7164-fw.c | 8 +-
1285 drivers/media/pci/saa7164/saa7164-vbi.c | 6 +-
1286 drivers/media/pci/ttpci/av7110.h | 1 +
1287 drivers/media/platform/blackfin/bfin_capture.c | 14 +-
1288 drivers/media/platform/coda.c | 4 +-
1289 drivers/media/platform/exynos-gsc/gsc-core.c | 8 +-
1290 drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +-
1291 drivers/media/platform/fsl-viu.c | 6 +-
1292 drivers/media/platform/m2m-deinterlace.c | 24 +---
1293 drivers/media/platform/mx2_emmaprp.c | 14 +-
1294 drivers/media/platform/omap/omap_vout.c | 36 +----
1295 drivers/media/platform/omap3isp/ispccdc.c | 4 +-
1296 drivers/media/platform/omap3isp/ispstat.c | 4 +-
1297 drivers/media/platform/omap3isp/ispstat.h | 4 +-
1298 drivers/media/platform/omap3isp/ispvideo.c | 2 +-
1299 drivers/media/platform/s5p-fimc/Kconfig | 1 +
1300 drivers/media/platform/s5p-fimc/fimc-capture.c | 4 +-
1301 drivers/media/platform/s5p-fimc/fimc-lite.c | 4 +-
1302 drivers/media/platform/s5p-fimc/fimc-m2m.c | 2 +-
1303 drivers/media/platform/s5p-fimc/fimc-mdevice.c | 45 +++---
1304 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +-
1305 drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +-
1306 drivers/media/platform/s5p-tv/mixer_video.c | 1 -
1307 drivers/media/platform/soc_camera/soc_camera.c | 4 +-
1308 drivers/media/radio/radio-aimslab.c | 2 +-
1309 drivers/media/radio/radio-isa.c | 10 +-
1310 drivers/media/radio/radio-sf16fmi.c | 2 +-
1311 drivers/media/radio/radio-tea5764.c | 4 +-
1312 drivers/media/radio/si4713-i2c.c | 2 +-
1313 drivers/media/radio/wl128x/fmdrv.h | 2 +-
1314 drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
1315 drivers/media/radio/wl128x/fmdrv_rx.c | 2 +-
1316 drivers/media/rc/ati_remote.c | 2 +-
1317 drivers/media/rc/ene_ir.c | 33 ++---
1318 drivers/media/rc/fintek-cir.c | 6 +-
1319 drivers/media/rc/gpio-ir-recv.c | 2 +-
1320 drivers/media/rc/iguanair.c | 2 +-
1321 drivers/media/rc/imon.c | 40 +++---
1322 drivers/media/rc/ir-jvc-decoder.c | 4 +-
1323 drivers/media/rc/ir-lirc-codec.c | 4 +-
1324 drivers/media/rc/ir-mce_kbd-decoder.c | 4 +-
1325 drivers/media/rc/ir-nec-decoder.c | 4 +-
1326 drivers/media/rc/ir-rc5-decoder.c | 14 +-
1327 drivers/media/rc/ir-rc5-sz-decoder.c | 6 +-
1328 drivers/media/rc/ir-rc6-decoder.c | 8 +-
1329 drivers/media/rc/ir-rx51.c | 13 +-
1330 drivers/media/rc/ir-sanyo-decoder.c | 4 +-
1331 drivers/media/rc/ir-sony-decoder.c | 17 ++-
1332 drivers/media/rc/ite-cir.c | 6 +-
1333 drivers/media/rc/keymaps/rc-imon-mce.c | 2 +-
1334 drivers/media/rc/keymaps/rc-rc6-mce.c | 2 +-
1335 drivers/media/rc/mceusb.c | 2 +-
1336 drivers/media/rc/nuvoton-cir.c | 13 +-
1337 drivers/media/rc/nuvoton-cir.h | 1 -
1338 drivers/media/rc/rc-loopback.c | 2 +-
1339 drivers/media/rc/rc-main.c | 73 +++++-----
1340 drivers/media/rc/redrat3.c | 2 +-
1341 drivers/media/rc/streamzap.c | 2 +-
1342 drivers/media/rc/ttusbir.c | 2 +-
1343 drivers/media/rc/winbond-cir.c | 6 +-
1344 drivers/media/tuners/max2165.c | 2 +-
1345 drivers/media/tuners/tua9001.c | 2 +-
1346 drivers/media/usb/au0828/au0828-cards.c | 2 +-
1347 drivers/media/usb/au0828/au0828-dvb.c | 5 +-
1348 drivers/media/usb/au0828/au0828-video.c | 16 +--
1349 drivers/media/usb/cx231xx/cx231xx-avcore.c | 9 +-
1350 drivers/media/usb/cx231xx/cx231xx-cards.c | 8 +-
1351 drivers/media/usb/cx231xx/cx231xx-i2c.c | 4 +-
1352 drivers/media/usb/cx231xx/cx231xx-input.c | 2 +-
1353 drivers/media/usb/dvb-usb-v2/af9015.c | 2 +-
1354 drivers/media/usb/dvb-usb-v2/af9035.c | 4 +-
1355 drivers/media/usb/dvb-usb-v2/anysee.c | 4 +-
1356 drivers/media/usb/dvb-usb-v2/az6007.c | 2 +-
1357 drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +-
1358 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 14 +-
1359 drivers/media/usb/dvb-usb-v2/it913x.c | 12 +-
1360 drivers/media/usb/dvb-usb-v2/lmedm04.c | 4 +-
1361 drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 +-
1362 drivers/media/usb/dvb-usb-v2/usb_urb.c | 8 +-
1363 drivers/media/usb/dvb-usb/az6027.c | 11 +-
1364 drivers/media/usb/dvb-usb/dib0700.h | 2 +-
1365 drivers/media/usb/dvb-usb/dib0700_core.c | 16 ++-
1366 drivers/media/usb/dvb-usb/dib0700_devices.c | 146 ++++++++++----------
1367 drivers/media/usb/dvb-usb/dvb-usb.h | 2 +-
1368 drivers/media/usb/dvb-usb/pctv452e.c | 4 +-
1369 drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +-
1370 drivers/media/usb/dvb-usb/ttusb2.c | 2 +-
1371 drivers/media/usb/dvb-usb/vp702x.c | 8 +-
1372 drivers/media/usb/em28xx/em28xx-cards.c | 15 +-
1373 drivers/media/usb/em28xx/em28xx-dvb.c | 84 ++++++++++-
1374 drivers/media/usb/em28xx/em28xx-input.c | 16 ++-
1375 drivers/media/usb/em28xx/em28xx.h | 1 +
1376 drivers/media/usb/gspca/gspca.c | 3 +-
1377 drivers/media/usb/gspca/gspca.h | 2 +-
1378 drivers/media/usb/gspca/jeilinj.c | 6 +-
1379 drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 6 +
1380 drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
1381 drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +-
1382 drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +-
1383 drivers/media/usb/pwc/pwc-if.c | 8 +-
1384 drivers/media/usb/s2255/s2255drv.c | 2 +-
1385 drivers/media/usb/siano/Kconfig | 1 +
1386 drivers/media/usb/stk1160/stk1160-i2c.c | 2 +-
1387 drivers/media/usb/tlg2300/pd-dvb.c | 1 +
1388 drivers/media/usb/tlg2300/pd-video.c | 4 +-
1389 drivers/media/usb/tm6000/tm6000-input.c | 20 +--
1390 drivers/media/usb/usbvision/usbvision.h | 2 +-
1391 drivers/media/usb/zr364xx/zr364xx.c | 3 +-
1392 drivers/media/v4l2-core/v4l2-common.c | 3 +-
1393 drivers/staging/media/dt3155v4l/dt3155v4l.c | 4 +-
1394 drivers/staging/media/go7007/go7007-v4l2.c | 2 +-
1395 drivers/staging/media/go7007/s2250-board.c | 13 +-
1396 drivers/staging/media/go7007/wis-ov7640.c | 13 +-
1397 drivers/staging/media/go7007/wis-saa7113.c | 13 +-
1398 drivers/staging/media/go7007/wis-saa7115.c | 13 +-
1399 drivers/staging/media/go7007/wis-sony-tuner.c | 13 +-
1400 drivers/staging/media/go7007/wis-tw2804.c | 13 +-
1401 drivers/staging/media/go7007/wis-tw9903.c | 13 +-
1402 drivers/staging/media/go7007/wis-uda1342.c | 13 +-
1403 drivers/staging/media/lirc/lirc_serial.c | 6 +-
1404 include/linux/dvb/dmx.h | 29 ----
1405 include/linux/dvb/video.h | 29 ----
1406 include/media/ir-kbd-i2c.h | 2 +-
1407 include/media/rc-core.h | 4 +-
1408 include/media/rc-map.h | 64 ++++++---
1409 211 files changed, 917 insertions(+), 962 deletions(-)
1410 delete mode 100644 include/linux/dvb/Kbuild
1411 delete mode 100644 include/linux/dvb/dmx.h
1412 delete mode 100644 include/linux/dvb/video.h
1413 $ git reset --hard HEAD^
1414 HEAD is now at 1d6b1af Merge remote-tracking branch 'hwmon-staging/hwmon-next'
1415 Merging refs/next/20121026/v4l-dvb
1416 $ git merge refs/next/20121026/v4l-dvb
1418 Merge made by the 'recursive' strategy.
1419 Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
1420 $ git merge kbuild/for-next
1422 Merge made by the 'recursive' strategy.
1423 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
1424 $ git merge kconfig/for-next
1426 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
1427 $ git merge libata/NEXT
1429 Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
1430 $ git merge infiniband/for-next
1432 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
1433 $ git merge pstore/master
1435 Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
1436 $ git merge acpi/next
1438 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
1439 $ git merge cpuidle/cpuidle-next
1440 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
1441 Resolved 'include/linux/cpuidle.h' using previous resolution.
1442 Auto-merging include/linux/cpuidle.h
1443 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
1444 Auto-merging drivers/cpuidle/coupled.c
1445 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
1446 Automatic merge failed; fix conflicts and then commit the result.
1448 [master 8c7c3c6] Merge remote-tracking branch 'cpuidle/cpuidle-next'
1449 $ git diff -M --stat --summary HEAD^..
1450 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
1451 $ git merge cpupowerutils/master
1453 Merging thermal/next (a180acf ACPI video: Ignore errors after _DOD evaluation.)
1454 $ git merge thermal/next
1455 Merge made by the 'recursive' strategy.
1456 Documentation/thermal/sysfs-api.txt | 64 ++
1457 drivers/acpi/thermal.c | 6 +-
1458 drivers/acpi/video.c | 11 +-
1459 drivers/platform/x86/acerhdf.c | 2 +-
1460 drivers/platform/x86/intel_mid_thermal.c | 2 +-
1461 drivers/power/power_supply_core.c | 2 +-
1462 drivers/staging/omap-thermal/omap-thermal-common.c | 2 +-
1463 drivers/thermal/Kconfig | 49 ++
1464 drivers/thermal/Makefile | 3 +
1465 drivers/thermal/exynos_thermal.c | 4 +-
1466 drivers/thermal/fair_share.c | 133 ++++
1467 drivers/thermal/rcar_thermal.c | 2 +-
1468 drivers/thermal/spear_thermal.c | 2 +-
1469 drivers/thermal/step_wise.c | 194 ++++++
1470 drivers/thermal/thermal_core.h | 53 ++
1471 drivers/thermal/thermal_sys.c | 700 +++++++++++++-------
1472 drivers/thermal/user_space.c | 68 ++
1473 include/linux/thermal.h | 128 +++-
1474 18 files changed, 1132 insertions(+), 293 deletions(-)
1475 create mode 100644 drivers/thermal/fair_share.c
1476 create mode 100644 drivers/thermal/step_wise.c
1477 create mode 100644 drivers/thermal/thermal_core.h
1478 create mode 100644 drivers/thermal/user_space.c
1479 Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
1480 $ git merge ieee1394/for-next
1482 Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
1483 $ git merge ubi/linux-next
1484 Merge made by the 'recursive' strategy.
1485 drivers/mtd/ubi/fastmap.c | 6 ++----
1486 1 file changed, 2 insertions(+), 4 deletions(-)
1487 Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
1488 $ git merge dlm/next
1490 Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
1491 $ git merge scsi/for-next
1493 Merging target-updates/for-next (a9bb162 target: remove ->get_device_rev)
1494 $ git merge target-updates/for-next
1495 Merge made by the 'recursive' strategy.
1496 drivers/target/loopback/tcm_loop.h | 1 -
1497 drivers/target/target_core_alua.c | 255 ++++------
1498 drivers/target/target_core_alua.h | 5 +-
1499 drivers/target/target_core_configfs.c | 682 ++++++++------------------
1500 drivers/target/target_core_device.c | 662 +++++++++++--------------
1501 drivers/target/target_core_fabric_configfs.c | 14 +-
1502 drivers/target/target_core_file.c | 163 ++----
1503 drivers/target/target_core_file.h | 2 +
1504 drivers/target/target_core_hba.c | 4 +-
1505 drivers/target/target_core_iblock.c | 202 +++-----
1506 drivers/target/target_core_iblock.h | 1 +
1507 drivers/target/target_core_internal.h | 13 +-
1508 drivers/target/target_core_pr.c | 316 +++++-------
1509 drivers/target/target_core_pr.h | 2 +-
1510 drivers/target/target_core_pscsi.c | 293 ++++-------
1511 drivers/target/target_core_pscsi.h | 2 +-
1512 drivers/target/target_core_rd.c | 111 ++---
1513 drivers/target/target_core_rd.h | 1 +
1514 drivers/target/target_core_sbc.c | 39 +-
1515 drivers/target/target_core_spc.c | 180 ++++---
1516 drivers/target/target_core_stat.c | 307 +++---------
1517 drivers/target/target_core_tmr.c | 6 +-
1518 drivers/target/target_core_transport.c | 403 ++++-----------
1519 drivers/target/target_core_ua.c | 6 +-
1520 include/target/target_core_backend.h | 34 +-
1521 include/target/target_core_base.h | 157 +-----
1522 26 files changed, 1331 insertions(+), 2530 deletions(-)
1523 Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
1524 $ git merge target-merge/for-next-merge
1526 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
1527 $ git merge ibft/linux-next
1529 Merging isci/all (6734092 isci: add a couple __iomem annotations)
1530 $ git merge isci/all
1532 Merging slave-dma/next (9e2dc7f dw_dmac: introduce to_dw_desc() macro)
1533 $ git merge slave-dma/next
1534 Auto-merging drivers/dma/dw_dmac_regs.h
1535 Auto-merging drivers/dma/Kconfig
1536 Merge made by the 'recursive' strategy.
1537 Documentation/devicetree/bindings/dma/snps-dma.txt | 44 ++++++
1538 arch/arm/boot/dts/spear1340.dtsi | 19 +++
1539 arch/arm/boot/dts/spear13xx.dtsi | 38 +++++
1540 arch/arm/mach-spear13xx/include/mach/spear.h | 2 -
1541 arch/arm/mach-spear13xx/spear1310.c | 4 +-
1542 arch/arm/mach-spear13xx/spear1340.c | 27 +---
1543 arch/arm/mach-spear13xx/spear13xx.c | 54 +------
1544 drivers/dma/Kconfig | 3 +-
1545 drivers/dma/dw_dmac.c | 167 +++++++++++++++++---
1546 drivers/dma/dw_dmac_regs.h | 6 +
1547 drivers/dma/pch_dma.c | 13 +-
1548 include/linux/dw_dmac.h | 45 ++++--
1549 12 files changed, 293 insertions(+), 129 deletions(-)
1550 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
1551 $ git merge dmaengine/next
1553 Merging net-next/master (f019948 Merge branch 'master' of git://1984.lsi.us.es/nf-next)
1554 $ git merge net-next/master
1555 Auto-merging net/ipv6/route.c
1556 Auto-merging net/ipv4/tcp_ipv4.c
1557 Auto-merging net/ipv4/tcp_input.c
1558 Auto-merging net/ipv4/tcp.c
1559 Auto-merging include/uapi/linux/usb/cdc.h
1560 Auto-merging drivers/net/usb/usbnet.c
1561 Removing drivers/net/ethernet/cadence/at91_ether.h
1562 Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1563 Auto-merging arch/arm/mach-at91/Kconfig
1564 Auto-merging MAINTAINERS
1565 Merge made by the 'recursive' strategy.
1566 Documentation/networking/ip-sysctl.txt | 14 +
1568 arch/arm/mach-at91/Kconfig | 4 -
1569 arch/arm/mach-at91/board-csb337.c | 2 +
1570 arch/arm/mach-at91/include/mach/at91rm9200_emac.h | 138 ---
1571 arch/avr32/Kconfig | 1 -
1572 drivers/isdn/mISDN/l1oip_core.c | 5 +-
1573 drivers/net/ethernet/cadence/Kconfig | 8 +-
1574 drivers/net/ethernet/cadence/at91_ether.c | 1029 +++--------------
1575 drivers/net/ethernet/cadence/at91_ether.h | 112 --
1576 drivers/net/ethernet/cadence/macb.c | 20 +-
1577 drivers/net/ethernet/cadence/macb.h | 22 +
1578 drivers/net/ethernet/emulex/benet/be.h | 20 +-
1579 drivers/net/ethernet/emulex/benet/be_cmds.c | 392 ++++++-
1580 drivers/net/ethernet/emulex/benet/be_cmds.h | 150 ++-
1581 drivers/net/ethernet/emulex/benet/be_ethtool.c | 80 +-
1582 drivers/net/ethernet/emulex/benet/be_hw.h | 3 +
1583 drivers/net/ethernet/emulex/benet/be_main.c | 535 ++++++---
1584 drivers/net/ethernet/intel/e1000e/netdev.c | 11 +
1585 drivers/net/ethernet/intel/igb/e1000_82575.h | 3 +
1586 drivers/net/ethernet/intel/igb/e1000_phy.c | 20 +
1587 drivers/net/ethernet/intel/igb/igb.h | 70 +-
1588 drivers/net/ethernet/intel/igb/igb_ethtool.c | 53 +-
1589 drivers/net/ethernet/intel/igb/igb_main.c | 1244 +++++++++++++--------
1590 drivers/net/ethernet/intel/igb/igb_ptp.c | 55 +-
1591 drivers/net/ethernet/intel/ixgbe/ixgbe.h | 7 +-
1592 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 44 +
1593 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 3 +-
1594 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 +
1595 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 102 +-
1596 drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 4 +
1597 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 7 +-
1598 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 +-
1599 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 31 +-
1600 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 109 +-
1601 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 465 +++++---
1602 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 +
1603 drivers/net/ethernet/intel/ixgbevf/defines.h | 7 +-
1604 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
1605 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 210 +++-
1606 drivers/net/ethernet/intel/ixgbevf/mbx.h | 10 +
1607 drivers/net/ethernet/intel/ixgbevf/vf.c | 58 +
1608 drivers/net/ethernet/intel/ixgbevf/vf.h | 2 +
1609 drivers/net/ethernet/realtek/r8169.c | 56 +-
1610 drivers/net/hyperv/rndis_filter.c | 5 -
1611 drivers/net/tun.c | 3 -
1612 drivers/net/usb/Kconfig | 18 +
1613 drivers/net/usb/Makefile | 1 +
1614 drivers/net/usb/asix_common.c | 117 +-
1615 drivers/net/usb/cdc_mbim.c | 412 +++++++
1616 drivers/net/usb/cdc_ncm.c | 641 +++++------
1617 drivers/net/usb/dm9601.c | 107 +-
1618 drivers/net/usb/int51x1.c | 52 +-
1619 drivers/net/usb/mcs7830.c | 85 +-
1620 drivers/net/usb/net1080.c | 110 +-
1621 drivers/net/usb/plusb.c | 11 +-
1622 drivers/net/usb/sierra_net.c | 45 +-
1623 drivers/net/usb/smsc75xx.c | 39 +-
1624 drivers/net/usb/smsc95xx.c | 115 +-
1625 drivers/net/usb/usbnet.c | 132 +++
1626 include/linux/platform_data/macb.h | 1 +
1627 include/linux/usb/cdc_ncm.h | 134 +++
1628 include/linux/usb/usbnet.h | 6 +
1629 include/net/af_unix.h | 1 -
1630 include/net/cls_cgroup.h | 6 +-
1631 include/net/ip6_fib.h | 10 +
1632 include/net/ip_vs.h | 195 +++-
1633 include/net/netns/sctp.h | 3 +
1634 include/net/sctp/constants.h | 8 -
1635 include/net/sctp/structs.h | 1 +
1636 include/uapi/linux/inet_diag.h | 3 +-
1637 include/uapi/linux/unix_diag.h | 1 +
1638 include/uapi/linux/usb/cdc.h | 23 +
1639 net/core/dev.c | 1 -
1640 net/core/netprio_cgroup.c | 2 +-
1641 net/core/pktgen.c | 6 +-
1642 net/core/rtnetlink.c | 6 +-
1643 net/core/sock.c | 11 +-
1644 net/ipv4/fib_semantics.c | 2 +-
1645 net/ipv4/inet_diag.c | 3 +
1646 net/ipv4/tcp.c | 5 +-
1647 net/ipv4/tcp_input.c | 43 +-
1648 net/ipv4/tcp_ipv4.c | 7 +-
1649 net/ipv6/ip6_fib.c | 57 +
1650 net/ipv6/route.c | 136 ++-
1651 net/ipv6/tcp_ipv6.c | 4 +-
1652 net/l2tp/l2tp_netlink.c | 2 +-
1653 net/netfilter/ipvs/Kconfig | 7 +-
1654 net/netfilter/ipvs/ip_vs_conn.c | 15 +-
1655 net/netfilter/ipvs/ip_vs_core.c | 404 ++++---
1656 net/netfilter/ipvs/ip_vs_dh.c | 2 +-
1657 net/netfilter/ipvs/ip_vs_lblc.c | 2 +-
1658 net/netfilter/ipvs/ip_vs_lblcr.c | 2 +-
1659 net/netfilter/ipvs/ip_vs_pe_sip.c | 18 +-
1660 net/netfilter/ipvs/ip_vs_proto.c | 6 +-
1661 net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 9 +-
1662 net/netfilter/ipvs/ip_vs_proto_sctp.c | 42 +-
1663 net/netfilter/ipvs/ip_vs_proto_tcp.c | 40 +-
1664 net/netfilter/ipvs/ip_vs_proto_udp.c | 41 +-
1665 net/netfilter/ipvs/ip_vs_sched.c | 2 +-
1666 net/netfilter/ipvs/ip_vs_sh.c | 2 +-
1667 net/netfilter/ipvs/ip_vs_xmit.c | 73 +-
1668 net/netfilter/xt_ipvs.c | 4 +-
1669 net/packet/af_packet.c | 2 -
1670 net/sched/cls_cgroup.c | 24 +
1671 net/sched/sch_api.c | 9 +-
1672 net/sched/sch_cbq.c | 3 +-
1673 net/sctp/Kconfig | 39 +-
1674 net/sctp/protocol.c | 9 +
1675 net/sctp/socket.c | 11 +-
1676 net/sctp/sysctl.c | 59 +
1678 net/unix/diag.c | 3 +
1679 113 files changed, 5074 insertions(+), 3526 deletions(-)
1680 delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1681 delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
1682 create mode 100644 drivers/net/usb/cdc_mbim.c
1683 create mode 100644 include/linux/usb/cdc_ncm.h
1684 Merging wireless-next/master (9b34f40 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
1685 $ git merge wireless-next/master
1686 Auto-merging drivers/net/wireless/mwifiex/scan.c
1687 Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
1688 Auto-merging drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
1689 Auto-merging drivers/net/wireless/b43/main.c
1690 Merge made by the 'recursive' strategy.
1691 arch/mips/bcm47xx/nvram.c | 4 +-
1692 arch/mips/bcm47xx/wgt634u.c | 8 +-
1693 drivers/bcma/driver_chipcommon.c | 23 +-
1694 drivers/bcma/driver_chipcommon_nflash.c | 3 +
1695 drivers/bcma/driver_chipcommon_pmu.c | 5 +-
1696 drivers/bcma/driver_chipcommon_sflash.c | 35 +-
1697 drivers/bcma/driver_mips.c | 48 +-
1698 drivers/bcma/driver_pci_host.c | 14 +-
1699 drivers/bcma/main.c | 54 +-
1700 drivers/bcma/sprom.c | 5 +-
1701 drivers/bluetooth/btmrvl_sdio.c | 28 +-
1702 drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 4 +-
1703 drivers/net/wireless/airo.c | 2 +-
1704 drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
1705 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
1706 drivers/net/wireless/ath/ath9k/ath9k.h | 2 +
1707 drivers/net/wireless/ath/ath9k/gpio.c | 60 +-
1708 drivers/net/wireless/ath/ath9k/hw.h | 1 +
1709 drivers/net/wireless/ath/ath9k/link.c | 12 +-
1710 drivers/net/wireless/ath/ath9k/main.c | 3 +-
1711 drivers/net/wireless/ath/carl9170/rx.c | 6 +-
1712 drivers/net/wireless/ath/carl9170/usb.c | 7 +
1713 drivers/net/wireless/ath/hw.c | 20 +-
1714 drivers/net/wireless/b43/main.c | 2 +-
1715 drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 4 -
1716 .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 +-
1717 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 36 -
1718 .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 +-
1719 drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 4 +-
1720 drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
1721 drivers/net/wireless/hostap/hostap_80211_rx.c | 2 +-
1722 drivers/net/wireless/ipw2x00/libipw_rx.c | 6 +-
1723 drivers/net/wireless/iwlwifi/dvm/main.c | 9 +-
1724 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 95 +-
1725 drivers/net/wireless/iwlwifi/iwl-io.c | 4 +-
1726 drivers/net/wireless/iwlwifi/iwl-io.h | 2 +-
1727 drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
1728 drivers/net/wireless/iwlwifi/iwl-trans.h | 8 +
1729 drivers/net/wireless/iwlwifi/pcie/rx.c | 3 +-
1730 drivers/net/wireless/iwlwifi/pcie/trans.c | 9 +-
1731 drivers/net/wireless/iwlwifi/pcie/tx.c | 18 +-
1732 drivers/net/wireless/libertas/mesh.c | 2 +-
1733 drivers/net/wireless/mwifiex/cfg80211.c | 4 +-
1734 drivers/net/wireless/mwifiex/cmdevt.c | 21 +-
1735 drivers/net/wireless/mwifiex/main.h | 2 -
1736 drivers/net/wireless/mwifiex/scan.c | 13 +-
1737 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
1738 drivers/net/wireless/orinoco/main.h | 2 +-
1739 drivers/net/wireless/orinoco/orinoco_usb.c | 9 +-
1740 drivers/net/wireless/rt2x00/rt2800lib.c | 100 +-
1741 drivers/net/wireless/rtlwifi/cam.c | 7 +-
1742 drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 6 +-
1743 drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 6 +-
1744 drivers/ssb/driver_mipscore.c | 16 +-
1745 include/linux/bcma/bcma.h | 2 +-
1746 include/linux/bcma/bcma_driver_chipcommon.h | 5 +
1747 include/linux/bcma/bcma_driver_mips.h | 3 +
1748 include/linux/bcma/bcma_regs.h | 5 +-
1749 include/linux/ieee80211.h | 47 +-
1750 include/linux/ssb/ssb_driver_mips.h | 10 +-
1751 include/net/bluetooth/a2mp.h | 24 +-
1752 include/net/bluetooth/amp.h | 50 +
1753 include/net/bluetooth/bluetooth.h | 1 -
1754 include/net/bluetooth/hci.h | 40 +-
1755 include/net/bluetooth/hci_core.h | 48 +-
1756 include/net/bluetooth/l2cap.h | 14 +-
1757 include/net/cfg80211.h | 14 +
1758 include/net/mac80211.h | 101 +-
1759 include/uapi/linux/nl80211.h | 48 +
1760 net/bluetooth/Kconfig | 1 +
1761 net/bluetooth/Makefile | 2 +-
1762 net/bluetooth/a2mp.c | 459 +++-
1763 net/bluetooth/af_bluetooth.c | 10 +-
1764 net/bluetooth/amp.c | 374 ++++
1765 net/bluetooth/bnep/core.c | 3 +-
1766 net/bluetooth/cmtp/core.c | 2 +-
1767 net/bluetooth/hci_conn.c | 70 +-
1768 net/bluetooth/hci_core.c | 65 +-
1769 net/bluetooth/hci_event.c | 167 +-
1770 net/bluetooth/hci_sysfs.c | 10 +-
1771 net/bluetooth/hidp/core.c | 8 +-
1772 net/bluetooth/l2cap_core.c | 503 +++--
1773 net/bluetooth/l2cap_sock.c | 89 +-
1774 net/bluetooth/lib.c | 14 -
1775 net/bluetooth/mgmt.c | 5 +-
1776 net/bluetooth/rfcomm/core.c | 19 +-
1777 net/bluetooth/rfcomm/sock.c | 9 +-
1778 net/bluetooth/rfcomm/tty.c | 6 +-
1779 net/bluetooth/sco.c | 12 +-
1780 net/bluetooth/smp.c | 2 +-
1781 net/mac80211/Kconfig | 2 +-
1782 net/mac80211/Makefile | 1 +
1783 net/mac80211/cfg.c | 284 +--
1784 net/mac80211/chan.c | 455 +++-
1785 net/mac80211/debugfs.h | 6 +-
1786 net/mac80211/debugfs_netdev.c | 10 +-
1787 net/mac80211/driver-ops.h | 65 +
1788 net/mac80211/ibss.c | 88 +-
1789 net/mac80211/ieee80211_i.h | 171 +-
1790 net/mac80211/iface.c | 44 +-
1791 net/mac80211/main.c | 105 +-
1792 net/mac80211/mesh.c | 43 +-
1793 net/mac80211/mesh.h | 4 +-
1794 net/mac80211/mesh_plink.c | 14 +-
1795 net/mac80211/mesh_sync.c | 55 +-
1796 net/mac80211/mlme.c | 219 +-
1797 net/mac80211/offchannel.c | 9 +-
1798 net/mac80211/pm.c | 2 +
1799 net/mac80211/rate.h | 12 +-
1800 net/mac80211/rx.c | 32 +-
1801 net/mac80211/scan.c | 29 +-
1802 net/mac80211/sta_info.c | 59 +-
1803 net/mac80211/status.c | 15 +-
1804 net/mac80211/trace.h | 112 +
1805 net/mac80211/tx.c | 281 ++-
1806 net/mac80211/util.c | 143 +-
1807 net/mac80211/vht.c | 35 +
1808 net/wireless/Makefile | 4 +-
1809 net/wireless/ap.c | 3 +-
1810 net/wireless/chan.c | 16 +-
1811 net/wireless/core.c | 12 +-
1812 net/wireless/core.h | 6 +-
1813 net/wireless/ethtool.c | 15 +-
1814 net/wireless/ibss.c | 9 +-
1815 net/wireless/mesh.c | 11 +-
1816 net/wireless/mlme.c | 92 +-
1817 net/wireless/nl80211.c | 255 ++-
1818 net/wireless/rdev-ops.h | 861 ++++++++
1819 net/wireless/scan.c | 138 +-
1820 net/wireless/sme.c | 12 +-
1821 net/wireless/sysfs.c | 5 +-
1822 net/wireless/trace.c | 7 +
1823 net/wireless/trace.h | 2286 ++++++++++++++++++++
1824 net/wireless/util.c | 14 +-
1825 net/wireless/wext-compat.c | 48 +-
1826 135 files changed, 7480 insertions(+), 1613 deletions(-)
1827 create mode 100644 include/net/bluetooth/amp.h
1828 create mode 100644 net/bluetooth/amp.c
1829 create mode 100644 net/mac80211/vht.c
1830 create mode 100644 net/wireless/rdev-ops.h
1831 create mode 100644 net/wireless/trace.c
1832 create mode 100644 net/wireless/trace.h
1833 Merging bluetooth/master (a11124c Bluetooth: Add put(hcon) when deleting hchan)
1834 $ git merge bluetooth/master
1835 Merge made by the 'recursive' strategy.
1836 include/net/bluetooth/hci.h | 7 +
1837 include/net/bluetooth/hci_core.h | 42 +-
1838 include/net/bluetooth/l2cap.h | 34 ++
1839 net/bluetooth/Kconfig | 1 -
1840 net/bluetooth/cmtp/capi.c | 2 +-
1841 net/bluetooth/cmtp/sock.c | 2 +-
1842 net/bluetooth/hci_conn.c | 6 +
1843 net/bluetooth/hci_core.c | 65 +--
1844 net/bluetooth/hci_event.c | 239 +++++++++-
1845 net/bluetooth/l2cap_core.c | 942 +++++++++++++++++++++++++++++++++++---
1846 net/bluetooth/l2cap_sock.c | 5 +
1847 net/bluetooth/mgmt.c | 88 ++--
1848 12 files changed, 1260 insertions(+), 173 deletions(-)
1849 Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
1850 $ git merge mtd/master
1851 Merge made by the 'recursive' strategy.
1852 drivers/mtd/nand/nand_base.c | 9 +++++----
1853 drivers/mtd/ofpart.c | 2 +-
1854 2 files changed, 6 insertions(+), 5 deletions(-)
1855 Merging l2-mtd/master (2c5e1925 mtd: mtd_oobtest: printk -> pr_{info,err,crit})
1856 $ git merge l2-mtd/master
1857 Removing include/linux/platform_data/mtd-nomadik-nand.h
1858 Removing drivers/mtd/nand/nomadik_nand.c
1859 Removing arch/arm/mach-nomadik/include/mach/fsmc.h
1860 Auto-merging arch/arm/boot/dts/spear13xx.dtsi
1861 Merge made by the 'recursive' strategy.
1862 .../devicetree/bindings/mtd/denali-nand.txt | 23 ++
1863 .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +-
1864 Documentation/devicetree/bindings/mtd/m25p80.txt | 29 +++
1865 arch/arm/boot/dts/spear13xx.dtsi | 10 +-
1866 arch/arm/boot/dts/spear300.dtsi | 8 +-
1867 arch/arm/boot/dts/spear310.dtsi | 8 +-
1868 arch/arm/boot/dts/spear320.dtsi | 8 +-
1869 arch/arm/boot/dts/spear600.dtsi | 8 +-
1870 arch/arm/configs/nhk8815_defconfig | 2 +-
1871 arch/arm/mach-nomadik/board-nhk8815.c | 73 +++---
1872 arch/arm/mach-nomadik/include/mach/fsmc.h | 29 ---
1873 arch/arm/mach-u300/core.c | 14 +-
1874 drivers/clk/clk-nomadik.c | 1 +
1875 drivers/mtd/cmdlinepart.c | 80 +++----
1876 drivers/mtd/devices/m25p80.c | 36 +--
1877 drivers/mtd/devices/slram.c | 2 +-
1878 drivers/mtd/devices/spear_smi.c | 13 +-
1879 drivers/mtd/nand/Kconfig | 26 ++-
1880 drivers/mtd/nand/Makefile | 3 +-
1881 drivers/mtd/nand/denali.c | 162 +++-----------
1882 drivers/mtd/nand/denali.h | 5 +
1883 drivers/mtd/nand/denali_dt.c | 167 ++++++++++++++
1884 drivers/mtd/nand/denali_pci.c | 144 ++++++++++++
1885 drivers/mtd/nand/fsl_elbc_nand.c | 15 --
1886 drivers/mtd/nand/fsmc_nand.c | 102 ++++-----
1887 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +-
1888 drivers/mtd/nand/nomadik_nand.c | 235 --------------------
1889 drivers/mtd/onenand/onenand_base.c | 2 +-
1890 drivers/mtd/tests/mtd_nandbiterrs.c | 73 +++---
1891 drivers/mtd/tests/mtd_nandecctest.c | 6 +-
1892 drivers/mtd/tests/mtd_oobtest.c | 171 +++++++-------
1893 drivers/mtd/tests/mtd_pagetest.c | 152 ++++++-------
1894 drivers/mtd/tests/mtd_readtest.c | 42 ++--
1895 drivers/mtd/tests/mtd_speedtest.c | 88 ++++----
1896 drivers/mtd/tests/mtd_stresstest.c | 44 ++--
1897 drivers/mtd/tests/mtd_subpagetest.c | 124 +++++------
1898 drivers/mtd/tests/mtd_torturetest.c | 73 +++---
1899 fs/jffs2/file.c | 39 ++--
1900 include/linux/mtd/fsmc.h | 3 -
1901 include/linux/mtd/mtd.h | 2 +-
1902 include/linux/platform_data/mtd-nomadik-nand.h | 16 --
1903 41 files changed, 1023 insertions(+), 1041 deletions(-)
1904 create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
1905 create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
1906 delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
1907 create mode 100644 drivers/mtd/nand/denali_dt.c
1908 create mode 100644 drivers/mtd/nand/denali_pci.c
1909 delete mode 100644 drivers/mtd/nand/nomadik_nand.c
1910 delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
1911 Merging crypto/master (3200da8 crypto: tegra - fix missing unlock on error case)
1912 $ git merge crypto/master
1913 Auto-merging arch/x86/crypto/crc32c-intel_glue.c
1914 Merge made by the 'recursive' strategy.
1915 arch/x86/crypto/Makefile | 2 +
1916 arch/x86/crypto/camellia_glue.c | 16 +-
1917 arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 332 +-
1918 arch/x86/crypto/cast5_avx_glue.c | 79 +-
1919 arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 190 +-
1920 arch/x86/crypto/cast6_avx_glue.c | 77 +-
1921 .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} | 81 +
1922 arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 460 ++
1923 arch/x86/crypto/glue_helper-asm-avx.S | 91 +
1924 arch/x86/crypto/glue_helper.c | 12 +-
1925 arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 166 +-
1926 arch/x86/crypto/serpent_avx_glue.c | 49 +-
1927 arch/x86/crypto/serpent_sse2_glue.c | 12 +-
1928 arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 208 +-
1929 arch/x86/crypto/twofish_avx_glue.c | 73 +-
1930 arch/x86/crypto/twofish_glue_3way.c | 20 +-
1931 arch/x86/include/asm/crypto/glue_helper.h | 28 +-
1932 arch/x86/include/asm/crypto/serpent-avx.h | 27 +-
1933 arch/x86/include/asm/crypto/twofish.h | 4 +-
1934 crypto/Kconfig | 10 +
1935 crypto/tcrypt.c | 6 +
1936 crypto/testmgr.c | 30 +
1937 crypto/testmgr.h | 5641 +++++++++++++++++++-
1938 crypto/vmac.c | 47 +-
1939 drivers/crypto/talitos.c | 3 +-
1940 drivers/crypto/tegra-aes.c | 8 +-
1941 include/crypto/vmac.h | 2 +
1942 27 files changed, 6956 insertions(+), 718 deletions(-)
1943 rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
1944 create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
1945 create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
1946 Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
1947 $ git merge drm/drm-next
1949 Merging sound/for-next (4ee3bff ALSA: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
1950 $ git merge sound/for-next
1951 Auto-merging sound/pci/hda/patch_sigmatel.c
1952 Auto-merging sound/pci/hda/patch_realtek.c
1953 Auto-merging sound/pci/hda/hda_intel.c
1954 Merge made by the 'recursive' strategy.
1955 include/sound/Kbuild | 10 -
1956 include/sound/asequencer.h | 594 +----------------
1957 include/sound/asound.h | 935 +-------------------------
1958 include/sound/emu10k1.h | 355 +---------
1959 include/sound/pcm.h | 3 +
1960 include/sound/sb16_csp.h | 104 +--
1961 include/uapi/sound/Kbuild | 10 +
1962 include/uapi/sound/asequencer.h | 614 +++++++++++++++++
1963 include/uapi/sound/asound.h | 961 +++++++++++++++++++++++++++
1964 include/{ => uapi}/sound/asound_fm.h | 0
1965 include/{ => uapi}/sound/compress_offload.h | 0
1966 include/{ => uapi}/sound/compress_params.h | 0
1967 include/uapi/sound/emu10k1.h | 373 +++++++++++
1968 include/{ => uapi}/sound/hdsp.h | 0
1969 include/{ => uapi}/sound/hdspm.h | 0
1970 include/uapi/sound/sb16_csp.h | 122 ++++
1971 include/{ => uapi}/sound/sfnt_info.h | 0
1972 sound/core/pcm_compat.c | 20 +-
1973 sound/core/pcm_lib.c | 57 +-
1974 sound/core/pcm_native.c | 2 +
1975 sound/drivers/Kconfig | 1 -
1976 sound/drivers/aloop.c | 36 +-
1977 sound/drivers/dummy.c | 73 +-
1978 sound/isa/Kconfig | 4 +-
1979 sound/pci/Kconfig | 2 +-
1980 sound/pci/asihpi/hpidspcd.c | 22 +-
1981 sound/pci/asihpi/hpioctl.c | 17 +-
1982 sound/pci/au88x0/au88x0_core.c | 7 +-
1983 sound/pci/hda/Kconfig | 5 +-
1984 sound/pci/hda/hda_codec.c | 92 ++-
1985 sound/pci/hda/hda_codec.h | 3 +
1986 sound/pci/hda/hda_intel.c | 119 +++-
1987 sound/pci/hda/hda_jack.c | 24 +
1988 sound/pci/hda/hda_jack.h | 2 +
1989 sound/pci/hda/hda_local.h | 8 +-
1990 sound/pci/hda/patch_cirrus.c | 5 +-
1991 sound/pci/hda/patch_conexant.c | 44 ++
1992 sound/pci/hda/patch_hdmi.c | 7 +-
1993 sound/pci/hda/patch_realtek.c | 7 +-
1994 sound/pci/hda/patch_sigmatel.c | 7 +-
1995 sound/pci/ice1712/Makefile | 2 +-
1996 sound/pci/ice1712/amp.c | 1 -
1997 sound/pci/ice1712/aureon.c | 4 +-
1998 sound/pci/ice1712/delta.c | 1 -
1999 sound/pci/ice1712/ews.c | 5 +-
2000 sound/pci/ice1712/hoontech.c | 1 -
2001 sound/pci/ice1712/ice1712.c | 9 +-
2002 sound/pci/ice1712/ice1712.h | 12 +-
2003 sound/pci/ice1712/ice1724.c | 19 +-
2004 sound/pci/ice1712/juli.c | 4 +-
2005 sound/pci/ice1712/maya44.c | 5 +-
2006 sound/pci/ice1712/phase.c | 3 +-
2007 sound/pci/ice1712/pontis.c | 1 -
2008 sound/pci/ice1712/prodigy192.c | 5 +-
2009 sound/pci/ice1712/prodigy_hifi.c | 1 -
2010 sound/pci/ice1712/psc724.c | 464 +++++++++++++
2011 sound/pci/ice1712/psc724.h | 13 +
2012 sound/pci/ice1712/quartet.c | 10 +-
2013 sound/pci/ice1712/revo.c | 1 -
2014 sound/pci/ice1712/se.c | 11 +-
2015 sound/pci/ice1712/vt1720_mobo.c | 1 -
2016 sound/pci/ice1712/wm8766.c | 361 ++++++++++
2017 sound/pci/ice1712/wm8766.h | 163 +++++
2018 sound/pci/ice1712/wm8776.c | 633 ++++++++++++++++++
2019 sound/pci/ice1712/wm8776.h | 226 +++++++
2020 sound/pci/ice1712/wtm.c | 1 -
2021 sound/usb/Kconfig | 2 +-
2022 sound/usb/pcm.c | 3 -
2023 sound/usb/quirks-table.h | 75 +++
2024 69 files changed, 4538 insertions(+), 2144 deletions(-)
2025 create mode 100644 include/uapi/sound/asequencer.h
2026 create mode 100644 include/uapi/sound/asound.h
2027 rename include/{ => uapi}/sound/asound_fm.h (100%)
2028 rename include/{ => uapi}/sound/compress_offload.h (100%)
2029 rename include/{ => uapi}/sound/compress_params.h (100%)
2030 create mode 100644 include/uapi/sound/emu10k1.h
2031 rename include/{ => uapi}/sound/hdsp.h (100%)
2032 rename include/{ => uapi}/sound/hdspm.h (100%)
2033 create mode 100644 include/uapi/sound/sb16_csp.h
2034 rename include/{ => uapi}/sound/sfnt_info.h (100%)
2035 create mode 100644 sound/pci/ice1712/psc724.c
2036 create mode 100644 sound/pci/ice1712/psc724.h
2037 create mode 100644 sound/pci/ice1712/wm8766.c
2038 create mode 100644 sound/pci/ice1712/wm8766.h
2039 create mode 100644 sound/pci/ice1712/wm8776.c
2040 create mode 100644 sound/pci/ice1712/wm8776.h
2041 Merging sound-asoc/for-next (a22864e Merge branches 'fix/omap', 'fix/ux500', 'fix/wm8994', 'topic/ak4104', 'topic/arizona', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
2042 $ git merge sound-asoc/for-next
2043 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2044 Merge made by the 'recursive' strategy.
2045 Documentation/devicetree/bindings/sound/ak4104.txt | 17 +
2046 Documentation/devicetree/bindings/sound/cs4271.txt | 2 +
2047 arch/arm/mach-at91/at91sam9260_devices.c | 9 +
2048 arch/arm/mach-at91/board-sam9g20ek.c | 17 +
2049 arch/arm/mach-davinci/board-da850-evm.c | 24 +-
2050 drivers/base/regmap/internal.h | 2 +
2051 drivers/base/regmap/regmap-debugfs.c | 50 +-
2052 drivers/base/regmap/regmap.c | 154 ++++--
2053 drivers/misc/atmel-ssc.c | 65 +--
2054 include/linux/mfd/wm8994/pdata.h | 5 +
2055 include/linux/platform_data/davinci_asp.h | 3 +
2056 include/linux/regmap.h | 6 +-
2057 include/sound/cs4271.h | 1 +
2058 sound/soc/atmel/sam9g20_wm8731.c | 51 +-
2059 sound/soc/codecs/Kconfig | 12 +
2060 sound/soc/codecs/Makefile | 4 +
2061 sound/soc/codecs/ak4104.c | 29 +-
2062 sound/soc/codecs/arizona.h | 47 +-
2063 sound/soc/codecs/cs4271.c | 21 +-
2064 sound/soc/codecs/da9055.c | 43 +-
2065 sound/soc/codecs/jz4740.c | 142 ++---
2066 sound/soc/codecs/si476x.c | 255 +++++++++
2067 sound/soc/codecs/wm2200.c | 260 +++++++--
2068 sound/soc/codecs/wm5102.c | 42 +-
2069 sound/soc/codecs/wm8750.c | 86 ++-
2070 sound/soc/codecs/wm8770.c | 217 ++++----
2071 sound/soc/codecs/wm8958-dsp2.c | 31 +-
2072 sound/soc/codecs/wm8971.c | 80 ++-
2073 sound/soc/codecs/wm8994.c | 100 ++--
2074 sound/soc/codecs/wm_adsp.c | 571 ++++++++++++++++++++
2075 sound/soc/codecs/wm_adsp.h | 54 ++
2076 sound/soc/codecs/wmfw.h | 128 +++++
2077 sound/soc/davinci/davinci-evm.c | 5 +
2078 sound/soc/davinci/davinci-mcasp.c | 93 +++-
2079 sound/soc/davinci/davinci-mcasp.h | 2 +-
2080 sound/soc/davinci/davinci-pcm.c | 53 +-
2081 sound/soc/davinci/davinci-pcm.h | 2 +
2082 sound/soc/fsl/Kconfig | 16 +-
2083 sound/soc/fsl/Makefile | 4 +
2084 sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++++
2085 sound/soc/fsl/pcm030-audio-fabric.c | 4 +-
2086 sound/soc/samsung/ac97.c | 6 +-
2087 sound/soc/samsung/bells.c | 222 ++++++--
2088 sound/soc/samsung/i2s.c | 8 +-
2089 sound/soc/samsung/pcm.c | 12 +-
2090 sound/soc/samsung/spdif.c | 12 +-
2091 sound/soc/sh/fsi.c | 25 +-
2092 sound/soc/soc-jack.c | 3 -
2093 48 files changed, 2777 insertions(+), 610 deletions(-)
2094 create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
2095 create mode 100644 sound/soc/codecs/si476x.c
2096 create mode 100644 sound/soc/codecs/wm_adsp.c
2097 create mode 100644 sound/soc/codecs/wm_adsp.h
2098 create mode 100644 sound/soc/codecs/wmfw.h
2099 create mode 100644 sound/soc/fsl/p1022_rdk.c
2100 $ git reset --hard HEAD^
2101 HEAD is now at 3a964ea Merge remote-tracking branch 'sound/for-next'
2102 Merging refs/next/20121026/sound-asoc
2103 $ git merge refs/next/20121026/sound-asoc
2104 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
2105 Merge made by the 'recursive' strategy.
2106 Documentation/devicetree/bindings/sound/ak4104.txt | 17 +
2107 Documentation/devicetree/bindings/sound/cs4271.txt | 2 +
2108 arch/arm/mach-at91/at91sam9260_devices.c | 9 +
2109 arch/arm/mach-at91/board-sam9g20ek.c | 17 +
2110 arch/arm/mach-davinci/board-da850-evm.c | 24 +-
2111 drivers/base/regmap/internal.h | 2 +
2112 drivers/base/regmap/regmap-debugfs.c | 50 +-
2113 drivers/base/regmap/regmap.c | 154 +++--
2114 drivers/misc/atmel-ssc.c | 65 +-
2115 include/linux/mfd/wm8994/pdata.h | 5 +
2116 include/linux/platform_data/davinci_asp.h | 3 +
2117 include/linux/regmap.h | 6 +-
2118 include/sound/cs4271.h | 1 +
2119 sound/soc/atmel/sam9g20_wm8731.c | 51 +-
2120 sound/soc/codecs/Kconfig | 4 +
2121 sound/soc/codecs/Makefile | 2 +
2122 sound/soc/codecs/ak4104.c | 29 +-
2123 sound/soc/codecs/cs4271.c | 21 +-
2124 sound/soc/codecs/da9055.c | 43 +-
2125 sound/soc/codecs/si476x.c | 255 ++++++++
2126 sound/soc/codecs/wm2200.c | 628 +++++++++++++++++++-
2127 sound/soc/codecs/wm5102.c | 4 +-
2128 sound/soc/codecs/wm8750.c | 86 ++-
2129 sound/soc/codecs/wm8770.c | 217 ++++---
2130 sound/soc/codecs/wm8958-dsp2.c | 31 +-
2131 sound/soc/codecs/wm8971.c | 80 ++-
2132 sound/soc/codecs/wm8994.c | 100 ++--
2133 sound/soc/codecs/wmfw.h | 99 +++
2134 sound/soc/davinci/davinci-evm.c | 5 +
2135 sound/soc/davinci/davinci-mcasp.c | 93 ++-
2136 sound/soc/davinci/davinci-mcasp.h | 2 +-
2137 sound/soc/davinci/davinci-pcm.c | 53 +-
2138 sound/soc/davinci/davinci-pcm.h | 2 +
2139 sound/soc/fsl/Kconfig | 16 +-
2140 sound/soc/fsl/Makefile | 4 +
2141 sound/soc/fsl/p1022_rdk.c | 392 ++++++++++++
2142 sound/soc/fsl/pcm030-audio-fabric.c | 4 +-
2143 sound/soc/samsung/ac97.c | 6 +-
2144 sound/soc/samsung/bells.c | 222 +++++--
2145 sound/soc/samsung/i2s.c | 8 +-
2146 sound/soc/samsung/pcm.c | 12 +-
2147 sound/soc/samsung/spdif.c | 12 +-
2148 sound/soc/sh/fsi.c | 25 +-
2149 sound/soc/soc-jack.c | 3 -
2150 44 files changed, 2339 insertions(+), 525 deletions(-)
2151 create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
2152 create mode 100644 sound/soc/codecs/si476x.c
2153 create mode 100644 sound/soc/codecs/wmfw.h
2154 create mode 100644 sound/soc/fsl/p1022_rdk.c
2155 Merging modules/modules-next (29183bf Merge branch 'module-signing-fixes' into modules-next)
2156 $ git merge modules/modules-next
2157 Merge made by the 'recursive' strategy.
2158 Documentation/ABI/testing/ima_policy | 3 +-
2159 arch/arm/include/uapi/asm/unistd.h | 1 +
2160 arch/arm/kernel/calls.S | 1 +
2161 arch/powerpc/include/asm/systbl.h | 1 +
2162 arch/powerpc/include/asm/unistd.h | 2 +-
2163 arch/powerpc/include/uapi/asm/unistd.h | 1 +
2164 arch/x86/syscalls/syscall_32.tbl | 1 +
2165 arch/x86/syscalls/syscall_64.tbl | 1 +
2166 include/linux/asn1.h | 2 +
2167 include/linux/ima.h | 6 +
2168 include/linux/security.h | 13 ++
2169 include/linux/syscalls.h | 1 +
2170 include/uapi/asm-generic/unistd.h | 4 +-
2171 kernel/module.c | 375 +++++++++++++++++++-------------
2172 kernel/module_signing.c | 14 +-
2173 kernel/sys_ni.c | 1 +
2174 lib/asn1_decoder.c | 10 +-
2175 security/capability.c | 6 +
2176 security/integrity/ima/ima.h | 2 +-
2177 security/integrity/ima/ima_api.c | 4 +-
2178 security/integrity/ima/ima_main.c | 21 ++
2179 security/integrity/ima/ima_policy.c | 3 +
2180 security/security.c | 10 +
2181 23 files changed, 319 insertions(+), 164 deletions(-)
2182 Merging virtio/virtio-next (929ce32e virtio_console: Use kmalloc instead of kzalloc)
2183 $ git merge virtio/virtio-next
2184 Merge made by the 'recursive' strategy.
2185 drivers/char/virtio_console.c | 14 ++++---
2186 drivers/lguest/core.c | 2 +-
2187 drivers/net/virtio_net.c | 46 +++++++++------------
2188 drivers/rpmsg/virtio_rpmsg_bus.c | 6 +--
2189 drivers/scsi/virtio_scsi.c | 24 ++++++-----
2190 drivers/virtio/virtio_mmio.c | 4 +-
2191 drivers/virtio/virtio_pci.c | 20 ++-------
2192 drivers/virtio/virtio_ring.c | 46 +++++++++------------
2193 include/linux/virtio.h | 10 ++++-
2194 include/linux/virtio_scsi.h | 28 ++++++++++++-
2196 net/9p/trans_virtio.c | 3 +-
2197 tools/lguest/lguest.c | 84 ++++++++++++++++----------------------
2198 tools/virtio/virtio_test.c | 4 +-
2199 14 files changed, 141 insertions(+), 151 deletions(-)
2200 Merging input/next (a6e8c0a Input: qt2160 - fix qt2160_write() implementation)
2201 $ git merge input/next
2202 Auto-merging drivers/input/touchscreen/wm831x-ts.c
2203 Auto-merging drivers/input/touchscreen/edt-ft5x06.c
2204 Auto-merging drivers/input/keyboard/qt2160.c
2205 Auto-merging drivers/input/keyboard/Kconfig
2206 Merge made by the 'recursive' strategy.
2207 .../bindings/input/touchscreen/mms114.txt | 34 +++
2208 drivers/input/input-mt.c | 2 +-
2209 drivers/input/input.c | 5 +-
2210 drivers/input/joystick/as5011.c | 19 +-
2211 drivers/input/keyboard/Kconfig | 2 +-
2212 drivers/input/keyboard/qt2160.c | 19 +-
2213 drivers/input/misc/Kconfig | 7 +-
2214 drivers/input/misc/wm831x-on.c | 5 +-
2215 drivers/input/serio/Kconfig | 9 +
2216 drivers/input/serio/Makefile | 1 +
2217 drivers/input/serio/arc_ps2.c | 274 ++++++++++++++++++++
2218 drivers/input/serio/i8042-io.h | 2 +-
2219 drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +-
2220 drivers/input/touchscreen/edt-ft5x06.c | 10 +-
2221 drivers/input/touchscreen/mms114.c | 62 ++++-
2222 drivers/input/touchscreen/wm831x-ts.c | 6 +-
2223 16 files changed, 424 insertions(+), 46 deletions(-)
2224 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
2225 create mode 100644 drivers/input/serio/arc_ps2.c
2226 Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
2227 $ git merge input-mt/for-next
2229 Merging cgroup/for-next (9a03061 Merge branch 'for-3.8' into for-next)
2230 $ git merge cgroup/for-next
2231 Merge made by the 'recursive' strategy.
2232 include/linux/cgroup.h | 1 -
2233 include/linux/freezer.h | 57 ++++++++++---
2234 kernel/cgroup.c | 62 +++++++-------
2235 kernel/cgroup_freezer.c | 209 +++++++++++++++++------------------------------
2236 kernel/fork.c | 9 +-
2237 kernel/freezer.c | 11 +--
2238 kernel/power/process.c | 13 +--
2239 kernel/signal.c | 20 ++---
2240 8 files changed, 158 insertions(+), 224 deletions(-)
2241 Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
2242 $ git merge block/for-next
2243 Resolved 'init/Kconfig' using previous resolution.
2244 Auto-merging init/Kconfig
2245 CONFLICT (content): Merge conflict in init/Kconfig
2246 Auto-merging drivers/block/mtip32xx/mtip32xx.h
2247 Auto-merging drivers/block/mtip32xx/mtip32xx.c
2248 Auto-merging drivers/block/loop.c
2249 Auto-merging drivers/block/floppy.c
2250 Auto-merging drivers/block/Kconfig
2251 Auto-merging block/genhd.c
2252 Auto-merging MAINTAINERS
2253 Automatic merge failed; fix conflicts and then commit the result.
2255 [master 10555a7] Merge remote-tracking branch 'block/for-next'
2256 $ git diff -M --stat --summary HEAD^..
2258 block/genhd.c | 6 +-
2259 drivers/block/Kconfig | 1 +
2260 drivers/block/cciss.c | 1 -
2261 drivers/block/floppy.c | 97 +-
2262 drivers/block/loop.c | 17 +-
2263 drivers/block/mtip32xx/mtip32xx.c | 19 +-
2264 drivers/block/mtip32xx/mtip32xx.h | 3 +
2265 drivers/block/xen-blkback/common.h | 4 +-
2266 drivers/block/xen-blkback/xenbus.c | 9 +-
2267 drivers/memstick/core/Kconfig | 12 +
2268 drivers/memstick/core/Makefile | 2 +-
2269 drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++
2270 drivers/memstick/core/ms_block.h | 293 +++++
2271 14 files changed, 2797 insertions(+), 69 deletions(-)
2272 create mode 100644 drivers/memstick/core/ms_block.c
2273 create mode 100644 drivers/memstick/core/ms_block.h
2274 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.)
2275 $ git merge quilt/device-mapper
2276 Merge made by the 'recursive' strategy.
2277 drivers/md/dm-raid1.c | 10 ++---
2278 drivers/md/dm-snap.c | 5 +--
2279 drivers/md/persistent-data/dm-btree-internal.h | 16 ++++----
2280 drivers/md/persistent-data/dm-btree-remove.c | 50 ++++++++++++------------
2281 drivers/md/persistent-data/dm-btree-spine.c | 6 +--
2282 drivers/md/persistent-data/dm-btree.c | 22 +++++------
2283 6 files changed, 53 insertions(+), 56 deletions(-)
2284 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
2285 $ git merge embedded/master
2287 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
2288 $ git merge firmware/master
2290 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
2291 $ git merge pcmcia/master
2293 Merging mmc/mmc-next (e196442 mmc: dw_mmc: enable controller interrupt before calling mmc_start_host)
2294 $ git merge mmc/mmc-next
2295 Merge made by the 'recursive' strategy.
2296 drivers/mmc/card/queue.c | 17 +-
2297 drivers/mmc/host/Kconfig | 7 +
2298 drivers/mmc/host/Makefile | 1 +
2299 drivers/mmc/host/dw_mmc-pci.c | 2 +-
2300 drivers/mmc/host/dw_mmc-pltfm.c | 16 +-
2301 drivers/mmc/host/dw_mmc.c | 31 +-
2302 drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 +++++++++++++++++++++++++++++++++++++
2303 drivers/mmc/host/sdhci-of-esdhc.c | 11 +
2304 drivers/mmc/host/sdhci-pltfm.c | 7 +
2305 drivers/mmc/host/sdhci-s3c.c | 28 +-
2306 drivers/mmc/host/sdhci.c | 3 +
2307 drivers/mmc/host/sdhci.h | 1 +
2308 include/linux/mmc/dw_mmc.h | 2 +-
2309 include/linux/mmc/sdhci.h | 1 +
2310 14 files changed, 1408 insertions(+), 51 deletions(-)
2311 create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
2312 Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
2313 $ git merge kgdb/kgdb-next
2314 Merge made by the 'recursive' strategy.
2315 Merging slab/for-next (d75f461 Merge branch 'slab/next' into for-next)
2316 $ git merge slab/for-next
2317 Merge made by the 'recursive' strategy.
2318 include/linux/mm_types.h | 7 +--
2319 mm/slab.c | 118 +++++++++-------------------------------
2320 mm/slab.h | 20 +++++++
2321 mm/slab_common.c | 109 +++++++++++++++++++++++++++++++++++++
2322 mm/slub.c | 135 +++++++++++++---------------------------------
2323 5 files changed, 194 insertions(+), 195 deletions(-)
2324 Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
2325 $ git merge uclinux/for-next
2327 Merging md/for-next (8814c65 md/raid5: add blktrace calls)
2328 $ git merge md/for-next
2329 Merge made by the 'recursive' strategy.
2330 block/blk-core.c | 1 +
2331 drivers/md/faulty.c | 5 +-
2332 drivers/md/md.c | 8 +-
2333 drivers/md/md.h | 8 +
2334 drivers/md/raid5.c | 446 ++++++++++++++++++++++++++++++++--
2335 drivers/md/raid5.h | 19 ++
2336 include/linux/raid/Kbuild | 2 -
2337 include/linux/raid/md_u.h | 141 +----------
2338 include/uapi/linux/raid/Kbuild | 2 +
2339 include/{ => uapi}/linux/raid/md_p.h | 0
2340 include/uapi/linux/raid/md_u.h | 155 ++++++++++++
2341 11 files changed, 617 insertions(+), 170 deletions(-)
2342 rename include/{ => uapi}/linux/raid/md_p.h (100%)
2343 create mode 100644 include/uapi/linux/raid/md_u.h
2344 Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
2345 $ git merge mfd/for-next
2347 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
2348 $ git merge battery/master
2350 Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
2351 $ git merge fbdev/fbdev-next
2353 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
2354 $ git merge viafb/viafb-next
2356 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
2357 $ git merge omap_dss2/for-next
2359 Merging regulator/for-next (65e370a Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
2360 $ git merge regulator/for-next
2361 Removing include/linux/regulator/tps65090-regulator.h
2362 Merge made by the 'recursive' strategy.
2363 .../bindings/regulator/gpio-regulator.txt | 36 +++
2364 .../devicetree/bindings/regulator/vexpress.txt | 32 ++
2365 drivers/regulator/Kconfig | 18 ++
2366 drivers/regulator/Makefile | 2 +
2367 drivers/regulator/core.c | 8 +-
2368 drivers/regulator/gpio-regulator.c | 94 ++++++
2369 drivers/regulator/lp8788-ldo.c | 2 +-
2370 drivers/regulator/max77686.c | 164 +++++++++-
2371 drivers/regulator/tps51632-regulator.c | 332 ++++++++++++++++++++
2372 drivers/regulator/tps65090-regulator.c | 247 +++++++++++----
2373 drivers/regulator/vexpress.c | 147 +++++++++
2374 include/linux/mfd/tps65090.h | 35 +++
2375 include/linux/regulator/driver.h | 3 +
2376 include/linux/regulator/tps51632-regulator.h | 47 +++
2377 include/linux/regulator/tps65090-regulator.h | 50 ---
2378 15 files changed, 1093 insertions(+), 124 deletions(-)
2379 create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
2380 create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
2381 create mode 100644 drivers/regulator/tps51632-regulator.c
2382 create mode 100644 drivers/regulator/vexpress.c
2383 create mode 100644 include/linux/regulator/tps51632-regulator.h
2384 delete mode 100644 include/linux/regulator/tps65090-regulator.h
2385 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)
2386 $ git merge security/next
2387 Resolved 'fs/cifs/cifsacl.c' using previous resolution.
2388 Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
2389 Resolved 'security/keys/keyctl.c' using previous resolution.
2390 Resolved 'security/keys/keyring.c' using previous resolution.
2391 Resolved 'security/keys/process_keys.c' using previous resolution.
2392 Auto-merging security/keys/request_key.c
2393 Auto-merging security/keys/process_keys.c
2394 CONFLICT (content): Merge conflict in security/keys/process_keys.c
2395 Auto-merging security/keys/keyring.c
2396 CONFLICT (content): Merge conflict in security/keys/keyring.c
2397 Auto-merging security/keys/keyctl.c
2398 CONFLICT (content): Merge conflict in security/keys/keyctl.c
2399 Auto-merging security/keys/key.c
2400 Auto-merging net/dns_resolver/dns_key.c
2401 CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
2402 Auto-merging kernel/cred.c
2403 Auto-merging include/linux/key.h
2404 Auto-merging fs/nfs/idmap.c
2405 Auto-merging fs/cifs/cifsacl.c
2406 CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
2407 Auto-merging arch/x86/kernel/vsyscall_64.c
2408 Auto-merging Documentation/security/keys.txt
2409 Automatic merge failed; fix conflicts and then commit the result.
2411 [master 28c616b] Merge remote-tracking branch 'security/next'
2412 $ git diff -M --stat --summary HEAD^..
2413 Documentation/prctl/seccomp_filter.txt | 74 +++++++++++++++++--
2414 Documentation/security/keys.txt | 17 +++++
2415 arch/x86/kernel/vsyscall_64.c | 110 ++++++++++++++-------------
2416 fs/cifs/cifsacl.c | 12 +--
2417 fs/nfs/idmap.c | 12 +--
2418 include/linux/cred.h | 17 +----
2419 include/linux/key.h | 1 +
2420 kernel/cred.c | 127 ++++----------------------------
2421 kernel/seccomp.c | 13 +++-
2422 net/dns_resolver/dns_key.c | 9 +--
2423 security/keys/key.c | 6 +-
2424 security/keys/keyctl.c | 15 ++--
2425 security/keys/keyring.c | 10 +--
2426 security/keys/process_keys.c | 94 ++++++++++-------------
2427 security/keys/request_key.c | 21 ++++--
2428 15 files changed, 252 insertions(+), 286 deletions(-)
2429 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
2430 $ git merge selinux/master
2432 Merge made by the 'recursive' strategy.
2433 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
2434 $ git merge lblnet/master
2436 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
2437 $ git merge watchdog/master
2438 Merge made by the 'recursive' strategy.
2439 drivers/watchdog/davinci_wdt.c | 4 ++--
2440 1 file changed, 2 insertions(+), 2 deletions(-)
2441 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
2442 $ git merge dwmw2-iommu/master
2444 Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
2445 $ git merge iommu/next
2446 Merge made by the 'recursive' strategy.
2447 Documentation/DMA-API-HOWTO.txt | 126 ++++++++++++++++++++++++
2448 Documentation/DMA-API.txt | 12 +++
2449 arch/x86/include/asm/dma-mapping.h | 1 +
2450 drivers/iommu/amd_iommu.c | 184 +++++++++++++++++++++++++++---------
2451 drivers/iommu/amd_iommu_types.h | 1 +
2452 include/linux/dma-debug.h | 7 ++
2453 lib/dma-debug.c | 71 +++++++++++++-
2454 7 files changed, 355 insertions(+), 47 deletions(-)
2455 Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
2456 $ git merge vfio/next
2458 Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
2459 $ git merge osd/linux-next
2460 Merge made by the 'recursive' strategy.
2461 drivers/scsi/osd/osd_uld.c | 28 ++++++++++++++++++++++++++++
2462 1 file changed, 28 insertions(+)
2463 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
2464 $ git merge jc_docs/docs-next
2466 Merging trivial/for-next (54d00f6 firmware: use noinline_for_stack)
2467 $ git merge trivial/for-next
2468 Merge made by the 'recursive' strategy.
2470 drivers/base/firmware_class.c | 2 +-
2471 drivers/char/ppdev.c | 6 +-----
2472 drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
2473 drivers/isdn/hisax/amd7930_fn.c | 2 +-
2474 drivers/isdn/hisax/isar.c | 2 +-
2475 drivers/isdn/pcbit/layer2.c | 2 +-
2476 drivers/net/wimax/i2400m/debugfs.c | 1 +
2477 drivers/target/iscsi/iscsi_target_parameters.c | 1 +
2478 drivers/tty/hvc/hvc_opal.c | 2 +-
2479 drivers/tty/hvc/hvc_vio.c | 2 +-
2480 drivers/tty/serial/8250/Kconfig | 2 +-
2481 drivers/tty/serial/bfin_uart.c | 2 +-
2482 drivers/tty/serial/icom.c | 2 +-
2484 net/rfkill/core.c | 4 ++--
2485 16 files changed, 20 insertions(+), 18 deletions(-)
2486 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
2487 $ git merge audit/for-next
2489 Merging pm/linux-next (e083feb Merge branch 'acpi-next' into linux-next)
2490 $ git merge pm/linux-next
2491 Merge made by the 'recursive' strategy.
2492 Documentation/ABI/testing/sysfs-class-devfreq | 15 +-
2493 Documentation/ABI/testing/sysfs-devices-power | 31 ++
2494 Documentation/power/pm_qos_interface.txt | 2 +-
2495 arch/x86/kernel/acpi/sleep.c | 2 +
2496 arch/x86/pci/acpi.c | 10 +
2497 drivers/acpi/acpi_pad.c | 8 +-
2498 drivers/acpi/container.c | 17 +-
2499 drivers/acpi/dock.c | 26 +-
2500 drivers/acpi/ec.c | 97 ++--
2501 drivers/acpi/internal.h | 4 +-
2502 drivers/acpi/osl.c | 7 +-
2503 drivers/acpi/processor_driver.c | 14 +
2504 drivers/acpi/scan.c | 11 +-
2505 drivers/acpi/sleep.c | 91 ++--
2506 drivers/base/core.c | 2 +-
2507 drivers/base/power/clock_ops.c | 6 +-
2508 drivers/base/power/domain.c | 11 +-
2509 drivers/base/power/opp.c | 55 +-
2510 drivers/base/power/power.h | 6 +-
2511 drivers/base/power/qos.c | 292 +++++++---
2512 drivers/base/power/sysfs.c | 94 +++-
2513 drivers/cpufreq/Makefile | 4 +-
2514 drivers/cpufreq/cpufreq.c | 18 +-
2515 drivers/cpufreq/cpufreq_conservative.c | 558 +++++--------------
2516 drivers/cpufreq/cpufreq_governor.c | 318 +++++++++++
2517 drivers/cpufreq/cpufreq_governor.h | 176 ++++++
2518 drivers/cpufreq/cpufreq_ondemand.c | 728 ++++++++-----------------
2519 drivers/cpufreq/cpufreq_performance.c | 2 +
2520 drivers/cpufreq/cpufreq_powersave.c | 2 +
2521 drivers/cpufreq/cpufreq_stats.c | 4 +-
2522 drivers/cpufreq/cpufreq_userspace.c | 2 +
2523 drivers/cpufreq/freq_table.c | 2 +
2524 drivers/cpuidle/cpuidle.c | 16 +-
2525 drivers/cpuidle/cpuidle.h | 4 +-
2526 drivers/cpuidle/governors/menu.c | 166 +++++-
2527 drivers/cpuidle/sysfs.c | 19 +-
2528 drivers/devfreq/devfreq.c | 517 +++++++++---------
2529 drivers/devfreq/governor.h | 13 +
2530 drivers/devfreq/governor_performance.c | 16 +-
2531 drivers/devfreq/governor_powersave.c | 16 +-
2532 drivers/devfreq/governor_simpleondemand.c | 33 ++
2533 drivers/devfreq/governor_userspace.c | 23 +-
2534 drivers/mtd/nand/sh_flctl.c | 4 +-
2535 drivers/pci/pci-acpi.c | 8 +-
2536 include/acpi/acpi_bus.h | 11 +-
2537 include/linux/acpi.h | 6 +-
2538 include/linux/cpufreq.h | 5 +-
2539 include/linux/devfreq.h | 49 +-
2540 include/linux/pm.h | 3 +-
2541 include/linux/pm_qos.h | 77 ++-
2542 include/linux/tick.h | 6 +
2544 kernel/power/main.c | 2 +-
2545 kernel/power/qos.c | 65 ++-
2546 kernel/power/swap.c | 2 +-
2547 kernel/time/tick-sched.c | 4 +
2548 56 files changed, 2173 insertions(+), 1515 deletions(-)
2549 create mode 100644 drivers/cpufreq/cpufreq_governor.c
2550 create mode 100644 drivers/cpufreq/cpufreq_governor.h
2551 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
2552 $ git merge apm/for-next
2554 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
2555 $ git merge fsnotify/for-next
2556 Resolved 'kernel/audit_tree.c' using previous resolution.
2557 Auto-merging kernel/audit_watch.c
2558 Auto-merging kernel/audit_tree.c
2559 CONFLICT (content): Merge conflict in kernel/audit_tree.c
2560 Auto-merging include/linux/fsnotify_backend.h
2561 Auto-merging fs/notify/notification.c
2562 Auto-merging fs/notify/inotify/inotify_user.c
2563 Auto-merging fs/notify/fanotify/fanotify_user.c
2564 Automatic merge failed; fix conflicts and then commit the result.
2566 [master 76d2fb0] Merge remote-tracking branch 'fsnotify/for-next'
2567 $ git diff -M --stat --summary HEAD^..
2568 fs/notify/dnotify/dnotify.c | 4 +-
2569 fs/notify/fanotify/fanotify.c | 6 +++
2570 fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
2571 fs/notify/group.c | 47 ++++++++++--------
2572 fs/notify/inode_mark.c | 14 ++++--
2573 fs/notify/inotify/inotify_fsnotify.c | 4 +-
2574 fs/notify/inotify/inotify_user.c | 34 ++++++-------
2575 fs/notify/mark.c | 91 +++++++++++++++++++---------------
2576 fs/notify/notification.c | 1 +
2577 fs/notify/vfsmount_mark.c | 14 ++++--
2578 include/linux/fsnotify_backend.h | 31 ++++++++----
2579 kernel/audit_tree.c | 10 ++--
2580 kernel/audit_watch.c | 4 +-
2581 13 files changed, 178 insertions(+), 119 deletions(-)
2582 Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
2583 $ git merge edac/linux_next
2584 Auto-merging drivers/edac/edac_mc.c
2585 Merge made by the 'recursive' strategy.
2586 drivers/edac/edac_mc.c | 21 +-
2587 drivers/edac/i7300_edac.c | 8 +-
2588 drivers/edac/i82975x_edac.c | 457 +++++++++++++++++++++++++------------------
2589 drivers/edac/sb_edac.c | 2 +-
2590 include/linux/edac.h | 1 -
2591 5 files changed, 288 insertions(+), 201 deletions(-)
2592 Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
2593 $ git merge edac-amd/for-next
2594 Auto-merging include/linux/edac.h
2595 Auto-merging drivers/edac/edac_mc.c
2596 Auto-merging drivers/edac/Kconfig
2597 Merge made by the 'recursive' strategy.
2598 drivers/edac/Kconfig | 8 +-
2599 drivers/edac/amd64_edac.c | 297 +++++++++++++++------------------------
2600 drivers/edac/amd64_edac.h | 59 ++++++--
2601 drivers/edac/amd64_edac_inj.c | 128 +++++++++--------
2602 drivers/edac/edac_mc.c | 57 ++++----
2603 drivers/edac/edac_mc_sysfs.c | 39 +++--
2604 drivers/edac/edac_module.c | 27 +++-
2605 drivers/edac/edac_pci.c | 3 +-
2606 drivers/edac/highbank_mc_edac.c | 8 +-
2607 drivers/edac/mce_amd.c | 254 +++++++++++++++++----------------
2608 drivers/edac/mce_amd.h | 11 +-
2609 include/linux/edac.h | 3 +
2610 12 files changed, 456 insertions(+), 438 deletions(-)
2611 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
2612 $ git merge devicetree/devicetree/next
2614 Merging dt-rh/for-next (2066306 arm: l2cc: doc: fix device tree example typo)
2615 $ git merge dt-rh/for-next
2616 Merge made by the 'recursive' strategy.
2617 Documentation/devicetree/bindings/arm/l2cc.txt | 2 +-
2618 1 file changed, 1 insertion(+), 1 deletion(-)
2619 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
2620 $ git merge spi/spi/next
2622 Merging spi-mb/spi-next (32111ab Merge tag 'spi-linus' into spi-next)
2623 $ git merge spi-mb/spi-next
2624 Auto-merging drivers/spi/spi-s3c64xx.c
2625 Merge made by the 'recursive' strategy.
2626 Documentation/devicetree/bindings/spi/omap-spi.txt | 4 +-
2627 drivers/spi/spi-omap2-mcspi.c | 25 +++++++---
2628 drivers/spi/spi-pl022.c | 52 ++++++++++++++------
2629 drivers/spi/spi-s3c64xx.c | 32 ++++++------
2630 include/linux/platform_data/spi-omap2-mcspi.h | 4 ++
2631 5 files changed, 77 insertions(+), 40 deletions(-)
2632 Merging tip/auto-latest (00f182d manual merge of numa/core)
2633 $ git merge tip/auto-latest
2634 Auto-merging kernel/time/tick-sched.c
2635 Auto-merging include/linux/mm_types.h
2636 Auto-merging include/linux/acpi.h
2637 Auto-merging drivers/base/core.c
2638 Auto-merging drivers/acpi/osl.c
2639 Auto-merging arch/s390/include/asm/pgtable.h
2640 Auto-merging arch/mips/include/asm/pgtable.h
2641 Auto-merging MAINTAINERS
2642 Merge made by the 'recursive' strategy.
2644 Documentation/acpi/initrd_table_override.txt | 94 ++
2645 Documentation/scheduler/numa-problem.txt | 230 +++
2646 Documentation/x86/boot.txt | 4 +-
2648 arch/mips/include/asm/pgtable.h | 2 +
2649 arch/s390/include/asm/pgtable.h | 19 +
2650 arch/sh/mm/Kconfig | 1 +
2651 arch/x86/Kconfig | 33 +-
2652 arch/x86/include/asm/mce.h | 21 +-
2653 arch/x86/include/asm/pgtable.h | 7 +
2654 arch/x86/kernel/Makefile | 1 -
2655 arch/x86/kernel/acpi/boot.c | 6 +
2656 arch/x86/kernel/cpu/mcheck/mce-internal.h | 2 -
2657 arch/x86/kernel/cpu/mcheck/mce-severity.c | 4 +-
2658 arch/x86/kernel/cpu/mcheck/mce.c | 209 +--
2659 arch/x86/kernel/cpu/mcheck/mce_intel.c | 8 +-
2660 arch/x86/kernel/cpu/perf_event.c | 121 ++
2661 arch/x86/kernel/cpu/perf_event.h | 5 +
2662 arch/x86/kernel/cpu/perf_event_amd.c | 9 +
2663 arch/x86/kernel/cpu/perf_event_intel.c | 9 +
2664 arch/x86/kernel/cpu/perf_event_p6.c | 2 +
2665 arch/x86/kernel/process.c | 39 +-
2666 arch/x86/kernel/rtc.c | 6 -
2667 arch/x86/kernel/setup.c | 4 +
2668 arch/x86/kernel/tsc.c | 6 +
2669 arch/x86/lguest/boot.c | 2 +-
2670 arch/x86/lib/copy_page_64.S | 120 +-
2671 arch/x86/mm/gup.c | 23 +-
2672 arch/x86/mm/pgtable.c | 8 +-
2673 drivers/acpi/Kconfig | 9 +
2674 drivers/acpi/osl.c | 202 ++-
2675 drivers/base/core.c | 21 +
2676 include/asm-generic/pgtable.h | 4 +
2677 include/linux/acpi.h | 16 +
2678 include/linux/device.h | 7 +
2679 include/linux/earlycpio.h | 17 +
2680 include/linux/huge_mm.h | 19 +
2681 include/linux/init_task.h | 8 +
2682 include/linux/mempolicy.h | 8 +
2683 include/linux/migrate.h | 7 +
2684 include/linux/migrate_mode.h | 3 +
2685 include/linux/mm.h | 122 +-
2686 include/linux/mm_types.h | 10 +
2687 include/linux/mmzone.h | 14 +-
2688 include/linux/page-flags-layout.h | 83 ++
2689 include/linux/sched.h | 66 +-
2690 include/uapi/linux/mempolicy.h | 17 +-
2692 kernel/lockdep_proc.c | 2 +-
2693 kernel/sched/core.c | 88 +-
2694 kernel/sched/debug.c | 39 +-
2695 kernel/sched/fair.c | 1483 ++++++++++++++++---
2696 kernel/sched/features.h | 19 +
2697 kernel/sched/sched.h | 96 +-
2698 kernel/sysctl.c | 45 +-
2699 kernel/time/tick-sched.c | 113 +-
2701 lib/earlycpio.c | 145 ++
2702 mm/huge_memory.c | 254 +++-
2703 mm/memory.c | 132 +-
2704 mm/mempolicy.c | 204 ++-
2705 mm/migrate.c | 87 +-
2706 mm/mprotect.c | 31 +-
2707 mm/pgtable-generic.c | 9 +-
2708 scripts/kconfig/Makefile | 7 +-
2709 tools/kvm/.gitignore | 12 +
2710 tools/kvm/CREDITS-Git | 30 +
2711 tools/kvm/Documentation/kernel-debugging.txt | 15 +
2712 tools/kvm/Documentation/kvm-balloon.txt | 24 +
2713 tools/kvm/Documentation/kvm-debug.txt | 16 +
2714 tools/kvm/Documentation/kvm-list.txt | 16 +
2715 tools/kvm/Documentation/kvm-pause.txt | 16 +
2716 tools/kvm/Documentation/kvm-resume.txt | 16 +
2717 tools/kvm/Documentation/kvm-run.txt | 62 +
2718 tools/kvm/Documentation/kvm-sandbox.txt | 16 +
2719 tools/kvm/Documentation/kvm-setup.txt | 15 +
2720 tools/kvm/Documentation/kvm-stat.txt | 19 +
2721 tools/kvm/Documentation/kvm-stop.txt | 16 +
2722 tools/kvm/Documentation/kvm-version.txt | 21 +
2723 tools/kvm/Documentation/virtio-console.txt | 41 +
2724 tools/kvm/Makefile | 457 ++++++
2725 tools/kvm/README | 112 ++
2726 tools/kvm/builtin-balloon.c | 80 +
2727 tools/kvm/builtin-debug.c | 110 ++
2728 tools/kvm/builtin-help.c | 63 +
2729 tools/kvm/builtin-list.c | 149 ++
2730 tools/kvm/builtin-pause.c | 88 ++
2731 tools/kvm/builtin-resume.c | 88 ++
2732 tools/kvm/builtin-run.c | 697 +++++++++
2733 tools/kvm/builtin-sandbox.c | 9 +
2734 tools/kvm/builtin-setup.c | 262 ++++
2735 tools/kvm/builtin-stat.c | 127 ++
2736 tools/kvm/builtin-stop.c | 70 +
2737 tools/kvm/builtin-version.c | 15 +
2738 tools/kvm/code16gcc.h | 15 +
2739 tools/kvm/command-list.txt | 15 +
2740 tools/kvm/config/feature-tests.mak | 177 +++
2741 tools/kvm/config/utilities.mak | 196 +++
2742 tools/kvm/disk/blk.c | 76 +
2743 tools/kvm/disk/core.c | 354 +++++
2744 tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++
2745 tools/kvm/disk/raw.c | 141 ++
2746 tools/kvm/framebuffer.c | 80 +
2747 tools/kvm/guest/init.c | 72 +
2748 tools/kvm/guest_compat.c | 99 ++
2749 tools/kvm/hw/i8042.c | 355 +++++
2750 tools/kvm/hw/pci-shmem.c | 405 ++++++
2751 tools/kvm/hw/rtc.c | 149 ++
2752 tools/kvm/hw/serial.c | 452 ++++++
2753 tools/kvm/hw/vesa.c | 89 ++
2754 tools/kvm/include/asm/hweight.h | 8 +
2755 tools/kvm/include/bios/memcpy.h | 9 +
2756 tools/kvm/include/kvm/8250-serial.h | 11 +
2757 tools/kvm/include/kvm/apic.h | 17 +
2758 tools/kvm/include/kvm/brlock.h | 41 +
2759 tools/kvm/include/kvm/builtin-balloon.h | 9 +
2760 tools/kvm/include/kvm/builtin-debug.h | 20 +
2761 tools/kvm/include/kvm/builtin-help.h | 6 +
2762 tools/kvm/include/kvm/builtin-list.h | 10 +
2763 tools/kvm/include/kvm/builtin-pause.h | 9 +
2764 tools/kvm/include/kvm/builtin-resume.h | 9 +
2765 tools/kvm/include/kvm/builtin-run.h | 11 +
2766 tools/kvm/include/kvm/builtin-sandbox.h | 6 +
2767 tools/kvm/include/kvm/builtin-setup.h | 11 +
2768 tools/kvm/include/kvm/builtin-stat.h | 9 +
2769 tools/kvm/include/kvm/builtin-stop.h | 9 +
2770 tools/kvm/include/kvm/builtin-version.h | 6 +
2771 tools/kvm/include/kvm/compiler.h | 10 +
2772 tools/kvm/include/kvm/disk-image.h | 96 ++
2773 tools/kvm/include/kvm/e820.h | 13 +
2774 tools/kvm/include/kvm/framebuffer.h | 36 +
2775 tools/kvm/include/kvm/guest_compat.h | 9 +
2776 tools/kvm/include/kvm/i8042.h | 12 +
2777 tools/kvm/include/kvm/ioeventfd.h | 28 +
2778 tools/kvm/include/kvm/ioport.h | 70 +
2779 tools/kvm/include/kvm/irq.h | 33 +
2780 tools/kvm/include/kvm/kvm-cmd.h | 17 +
2781 tools/kvm/include/kvm/kvm-config.h | 60 +
2782 tools/kvm/include/kvm/kvm-cpu.h | 26 +
2783 tools/kvm/include/kvm/kvm-ipc.h | 26 +
2784 tools/kvm/include/kvm/kvm.h | 121 ++
2785 tools/kvm/include/kvm/msi.h | 10 +
2786 tools/kvm/include/kvm/mutex.h | 33 +
2787 tools/kvm/include/kvm/parse-options.h | 218 +++
2788 tools/kvm/include/kvm/pci-shmem.h | 32 +
2789 tools/kvm/include/kvm/pci.h | 95 ++
2790 tools/kvm/include/kvm/qcow.h | 133 ++
2791 tools/kvm/include/kvm/rbtree-interval.h | 28 +
2792 tools/kvm/include/kvm/read-write.h | 43 +
2793 tools/kvm/include/kvm/rtc.h | 9 +
2794 tools/kvm/include/kvm/rwsem.h | 39 +
2795 tools/kvm/include/kvm/sdl.h | 28 +
2796 tools/kvm/include/kvm/segment.h | 21 +
2797 tools/kvm/include/kvm/strbuf.h | 20 +
2798 tools/kvm/include/kvm/symbol.h | 30 +
2799 tools/kvm/include/kvm/term.h | 24 +
2800 tools/kvm/include/kvm/threadpool.h | 38 +
2801 tools/kvm/include/kvm/types.h | 7 +
2802 tools/kvm/include/kvm/uip.h | 360 +++++
2803 tools/kvm/include/kvm/util-init.h | 51 +
2804 tools/kvm/include/kvm/util.h | 97 ++
2805 tools/kvm/include/kvm/vesa.h | 18 +
2806 tools/kvm/include/kvm/virtio-9p.h | 76 +
2807 tools/kvm/include/kvm/virtio-balloon.h | 9 +
2808 tools/kvm/include/kvm/virtio-blk.h | 12 +
2809 tools/kvm/include/kvm/virtio-console.h | 10 +
2810 tools/kvm/include/kvm/virtio-mmio.h | 58 +
2811 tools/kvm/include/kvm/virtio-net.h | 30 +
2812 tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
2813 tools/kvm/include/kvm/virtio-pci.h | 49 +
2814 tools/kvm/include/kvm/virtio-rng.h | 9 +
2815 tools/kvm/include/kvm/virtio-scsi.h | 26 +
2816 tools/kvm/include/kvm/virtio.h | 102 ++
2817 tools/kvm/include/kvm/vnc.h | 22 +
2818 tools/kvm/include/linux/bitops.h | 33 +
2819 tools/kvm/include/linux/byteorder.h | 7 +
2820 tools/kvm/include/linux/compiler.h | 20 +
2821 tools/kvm/include/linux/kernel.h | 41 +
2822 tools/kvm/include/linux/module.h | 6 +
2823 tools/kvm/include/linux/prefetch.h | 6 +
2824 tools/kvm/include/linux/stddef.h | 16 +
2825 tools/kvm/include/linux/types.h | 51 +
2826 tools/kvm/ioeventfd.c | 216 +++
2827 tools/kvm/ioport.c | 198 +++
2828 tools/kvm/kvm-cmd.c | 91 ++
2829 tools/kvm/kvm-cpu.c | 242 ++++
2830 tools/kvm/kvm-ipc.c | 498 +++++++
2831 tools/kvm/kvm.c | 458 ++++++
2832 tools/kvm/main.c | 19 +
2833 tools/kvm/mmio.c | 139 ++
2834 tools/kvm/net/uip/arp.c | 30 +
2835 tools/kvm/net/uip/buf.c | 114 ++
2836 tools/kvm/net/uip/core.c | 190 +++
2837 tools/kvm/net/uip/csum.c | 92 ++
2838 tools/kvm/net/uip/dhcp.c | 202 +++
2839 tools/kvm/net/uip/icmp.c | 29 +
2840 tools/kvm/net/uip/ipv4.c | 29 +
2841 tools/kvm/net/uip/tcp.c | 345 +++++
2842 tools/kvm/net/uip/udp.c | 236 +++
2843 tools/kvm/pci.c | 215 +++
2844 tools/kvm/powerpc/boot.c | 8 +
2845 tools/kvm/powerpc/cpu_info.c | 195 +++
2846 tools/kvm/powerpc/cpu_info.h | 42 +
2847 tools/kvm/powerpc/include/kvm/barrier.h | 6 +
2848 tools/kvm/powerpc/include/kvm/kvm-arch.h | 68 +
2849 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
2850 tools/kvm/powerpc/ioport.c | 18 +
2851 tools/kvm/powerpc/irq.c | 56 +
2852 tools/kvm/powerpc/kvm-cpu.c | 290 ++++
2853 tools/kvm/powerpc/kvm.c | 529 +++++++
2854 tools/kvm/powerpc/spapr.h | 93 ++
2855 tools/kvm/powerpc/spapr_hcall.c | 134 ++
2856 tools/kvm/powerpc/spapr_hvcons.c | 108 ++
2857 tools/kvm/powerpc/spapr_hvcons.h | 19 +
2858 tools/kvm/powerpc/spapr_pci.c | 423 ++++++
2859 tools/kvm/powerpc/spapr_pci.h | 57 +
2860 tools/kvm/powerpc/spapr_rtas.c | 233 +++
2861 tools/kvm/powerpc/xics.c | 522 +++++++
2862 tools/kvm/powerpc/xics.h | 18 +
2863 tools/kvm/symbol.c | 133 ++
2864 tools/kvm/term.c | 171 +++
2865 tools/kvm/tests/Makefile | 19 +
2866 tools/kvm/tests/boot/Makefile | 13 +
2867 tools/kvm/tests/boot/init.c | 11 +
2868 tools/kvm/tests/kernel/.gitignore | 2 +
2869 tools/kvm/tests/kernel/Makefile | 20 +
2870 tools/kvm/tests/kernel/README | 16 +
2871 tools/kvm/tests/kernel/kernel.S | 8 +
2872 tools/kvm/tests/pit/.gitignore | 2 +
2873 tools/kvm/tests/pit/Makefile | 20 +
2874 tools/kvm/tests/pit/README | 16 +
2875 tools/kvm/tests/pit/tick.S | 101 ++
2876 tools/kvm/ui/sdl.c | 321 ++++
2877 tools/kvm/ui/vnc.c | 248 ++++
2878 tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
2879 tools/kvm/util/generate-cmdlist.sh | 23 +
2880 tools/kvm/util/init.c | 69 +
2881 tools/kvm/util/kvm-ifup-vbr0 | 6 +
2882 tools/kvm/util/parse-options.c | 577 ++++++++
2883 tools/kvm/util/rbtree-interval.c | 118 ++
2884 tools/kvm/util/read-write.c | 354 +++++
2885 tools/kvm/util/set_private_br.sh | 51 +
2886 tools/kvm/util/strbuf.c | 62 +
2887 tools/kvm/util/threadpool.c | 173 +++
2888 tools/kvm/util/util.c | 133 ++
2889 tools/kvm/virtio/9p-pdu.c | 287 ++++
2890 tools/kvm/virtio/9p.c | 1432 ++++++++++++++++++
2891 tools/kvm/virtio/balloon.c | 270 ++++
2892 tools/kvm/virtio/blk.c | 315 ++++
2893 tools/kvm/virtio/console.c | 203 +++
2894 tools/kvm/virtio/core.c | 233 +++
2895 tools/kvm/virtio/mmio.c | 264 ++++
2896 tools/kvm/virtio/net.c | 670 +++++++++
2897 tools/kvm/virtio/pci.c | 398 +++++
2898 tools/kvm/virtio/rng.c | 193 +++
2899 tools/kvm/virtio/scsi.c | 309 ++++
2900 tools/kvm/x86/bios.c | 174 +++
2901 tools/kvm/x86/bios/.gitignore | 3 +
2902 tools/kvm/x86/bios/bios-rom.S | 12 +
2903 tools/kvm/x86/bios/e820.c | 72 +
2904 tools/kvm/x86/bios/entry.S | 92 ++
2905 tools/kvm/x86/bios/gen-offsets.sh | 14 +
2906 tools/kvm/x86/bios/int10.c | 110 ++
2907 tools/kvm/x86/bios/int15.c | 18 +
2908 tools/kvm/x86/bios/local.S | 7 +
2909 tools/kvm/x86/bios/macro.S | 25 +
2910 tools/kvm/x86/bios/memcpy.c | 23 +
2911 tools/kvm/x86/bios/rom.ld.S | 16 +
2912 tools/kvm/x86/boot.c | 41 +
2913 tools/kvm/x86/cpuid.c | 60 +
2914 tools/kvm/x86/include/kvm/assembly.h | 24 +
2915 tools/kvm/x86/include/kvm/barrier.h | 20 +
2916 tools/kvm/x86/include/kvm/bios-export.h | 13 +
2917 tools/kvm/x86/include/kvm/bios.h | 93 ++
2918 tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
2919 tools/kvm/x86/include/kvm/cpufeature.h | 41 +
2920 tools/kvm/x86/include/kvm/interrupt.h | 26 +
2921 tools/kvm/x86/include/kvm/kvm-arch.h | 43 +
2922 tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
2923 tools/kvm/x86/include/kvm/mptable.h | 9 +
2924 tools/kvm/x86/interrupt.c | 28 +
2925 tools/kvm/x86/ioport.c | 77 +
2926 tools/kvm/x86/irq.c | 224 +++
2927 tools/kvm/x86/kvm-cpu.c | 425 ++++++
2928 tools/kvm/x86/kvm.c | 362 +++++
2929 tools/kvm/x86/mptable.c | 289 ++++
2930 tools/lib/traceevent/Makefile | 2 +-
2931 tools/perf/Documentation/Makefile | 31 +-
2932 tools/perf/Documentation/android.txt | 75 +
2933 tools/perf/Documentation/perf-diff.txt | 60 +
2934 tools/perf/Documentation/perf-inject.txt | 11 +
2935 tools/perf/Documentation/perf-stat.txt | 5 +
2936 tools/perf/Documentation/perf-trace.txt | 6 +
2937 tools/perf/Makefile | 117 +-
2938 tools/perf/arch/common.c | 178 +++
2939 tools/perf/arch/common.h | 10 +
2940 tools/perf/builtin-annotate.c | 10 +-
2941 tools/perf/builtin-diff.c | 405 +++++-
2942 tools/perf/builtin-inject.c | 195 ++-
2943 tools/perf/builtin-kvm.c | 35 +-
2944 tools/perf/builtin-record.c | 37 +
2945 tools/perf/builtin-report.c | 11 +-
2946 tools/perf/builtin-sched.c | 3 +-
2947 tools/perf/builtin-script.c | 4 +-
2948 tools/perf/builtin-stat.c | 42 +-
2949 tools/perf/builtin-test.c | 20 +-
2950 tools/perf/builtin-top.c | 7 +-
2951 tools/perf/builtin-trace.c | 403 +++++-
2952 tools/perf/config/feature-tests.mak | 25 +-
2953 tools/perf/config/utilities.mak | 10 +-
2954 tools/perf/perf.c | 2 +
2955 tools/perf/ui/hist.c | 134 +-
2956 tools/perf/ui/stdio/hist.c | 2 +-
2957 tools/perf/util/annotate.h | 1 -
2958 tools/perf/util/build-id.c | 12 +-
2959 tools/perf/util/build-id.h | 4 +
2960 tools/perf/util/event.c | 228 +--
2961 tools/perf/util/event.h | 6 +-
2962 tools/perf/util/evlist.c | 3 -
2963 tools/perf/util/hist.h | 8 +
2964 tools/perf/util/machine.c | 277 ++++
2965 tools/perf/util/machine.h | 19 +
2966 tools/perf/util/parse-events-test.c | 68 +
2967 tools/perf/util/parse-events.c | 20 +-
2968 tools/perf/util/parse-events.h | 2 +
2969 tools/perf/util/parse-events.y | 18 +
2970 tools/perf/util/pmu.c | 7 +-
2971 tools/perf/util/rblist.c | 4 +-
2972 .../util/scripting-engines/trace-event-python.c | 1 -
2973 tools/perf/util/session.c | 4 +-
2974 tools/perf/util/sort.h | 18 +
2975 tools/perf/util/thread.c | 41 +-
2976 tools/perf/util/thread.h | 2 +
2977 tools/perf/util/trace-event-read.c | 2 -
2978 tools/perf/util/util.c | 2 +
2979 tools/perf/util/util.h | 6 +
2980 337 files changed, 31379 insertions(+), 1125 deletions(-)
2981 create mode 100644 Documentation/acpi/initrd_table_override.txt
2982 create mode 100644 Documentation/scheduler/numa-problem.txt
2983 create mode 100644 include/linux/earlycpio.h
2984 create mode 100644 include/linux/page-flags-layout.h
2985 create mode 100644 lib/earlycpio.c
2986 create mode 100644 tools/kvm/.gitignore
2987 create mode 100644 tools/kvm/CREDITS-Git
2988 create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
2989 create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
2990 create mode 100644 tools/kvm/Documentation/kvm-debug.txt
2991 create mode 100644 tools/kvm/Documentation/kvm-list.txt
2992 create mode 100644 tools/kvm/Documentation/kvm-pause.txt
2993 create mode 100644 tools/kvm/Documentation/kvm-resume.txt
2994 create mode 100644 tools/kvm/Documentation/kvm-run.txt
2995 create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
2996 create mode 100644 tools/kvm/Documentation/kvm-setup.txt
2997 create mode 100644 tools/kvm/Documentation/kvm-stat.txt
2998 create mode 100644 tools/kvm/Documentation/kvm-stop.txt
2999 create mode 100644 tools/kvm/Documentation/kvm-version.txt
3000 create mode 100644 tools/kvm/Documentation/virtio-console.txt
3001 create mode 100644 tools/kvm/Makefile
3002 create mode 100644 tools/kvm/README
3003 create mode 100644 tools/kvm/builtin-balloon.c
3004 create mode 100644 tools/kvm/builtin-debug.c
3005 create mode 100644 tools/kvm/builtin-help.c
3006 create mode 100644 tools/kvm/builtin-list.c
3007 create mode 100644 tools/kvm/builtin-pause.c
3008 create mode 100644 tools/kvm/builtin-resume.c
3009 create mode 100644 tools/kvm/builtin-run.c
3010 create mode 100644 tools/kvm/builtin-sandbox.c
3011 create mode 100644 tools/kvm/builtin-setup.c
3012 create mode 100644 tools/kvm/builtin-stat.c
3013 create mode 100644 tools/kvm/builtin-stop.c
3014 create mode 100644 tools/kvm/builtin-version.c
3015 create mode 100644 tools/kvm/code16gcc.h
3016 create mode 100644 tools/kvm/command-list.txt
3017 create mode 100644 tools/kvm/config/feature-tests.mak
3018 create mode 100644 tools/kvm/config/utilities.mak
3019 create mode 100644 tools/kvm/disk/blk.c
3020 create mode 100644 tools/kvm/disk/core.c
3021 create mode 100644 tools/kvm/disk/qcow.c
3022 create mode 100644 tools/kvm/disk/raw.c
3023 create mode 100644 tools/kvm/framebuffer.c
3024 create mode 100644 tools/kvm/guest/init.c
3025 create mode 100644 tools/kvm/guest_compat.c
3026 create mode 100644 tools/kvm/hw/i8042.c
3027 create mode 100644 tools/kvm/hw/pci-shmem.c
3028 create mode 100644 tools/kvm/hw/rtc.c
3029 create mode 100644 tools/kvm/hw/serial.c
3030 create mode 100644 tools/kvm/hw/vesa.c
3031 create mode 100644 tools/kvm/include/asm/hweight.h
3032 create mode 100644 tools/kvm/include/bios/memcpy.h
3033 create mode 100644 tools/kvm/include/kvm/8250-serial.h
3034 create mode 100644 tools/kvm/include/kvm/apic.h
3035 create mode 100644 tools/kvm/include/kvm/brlock.h
3036 create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
3037 create mode 100644 tools/kvm/include/kvm/builtin-debug.h
3038 create mode 100644 tools/kvm/include/kvm/builtin-help.h
3039 create mode 100644 tools/kvm/include/kvm/builtin-list.h
3040 create mode 100644 tools/kvm/include/kvm/builtin-pause.h
3041 create mode 100644 tools/kvm/include/kvm/builtin-resume.h
3042 create mode 100644 tools/kvm/include/kvm/builtin-run.h
3043 create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
3044 create mode 100644 tools/kvm/include/kvm/builtin-setup.h
3045 create mode 100644 tools/kvm/include/kvm/builtin-stat.h
3046 create mode 100644 tools/kvm/include/kvm/builtin-stop.h
3047 create mode 100644 tools/kvm/include/kvm/builtin-version.h
3048 create mode 100644 tools/kvm/include/kvm/compiler.h
3049 create mode 100644 tools/kvm/include/kvm/disk-image.h
3050 create mode 100644 tools/kvm/include/kvm/e820.h
3051 create mode 100644 tools/kvm/include/kvm/framebuffer.h
3052 create mode 100644 tools/kvm/include/kvm/guest_compat.h
3053 create mode 100644 tools/kvm/include/kvm/i8042.h
3054 create mode 100644 tools/kvm/include/kvm/ioeventfd.h
3055 create mode 100644 tools/kvm/include/kvm/ioport.h
3056 create mode 100644 tools/kvm/include/kvm/irq.h
3057 create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
3058 create mode 100644 tools/kvm/include/kvm/kvm-config.h
3059 create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
3060 create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
3061 create mode 100644 tools/kvm/include/kvm/kvm.h
3062 create mode 100644 tools/kvm/include/kvm/msi.h
3063 create mode 100644 tools/kvm/include/kvm/mutex.h
3064 create mode 100644 tools/kvm/include/kvm/parse-options.h
3065 create mode 100644 tools/kvm/include/kvm/pci-shmem.h
3066 create mode 100644 tools/kvm/include/kvm/pci.h
3067 create mode 100644 tools/kvm/include/kvm/qcow.h
3068 create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
3069 create mode 100644 tools/kvm/include/kvm/read-write.h
3070 create mode 100644 tools/kvm/include/kvm/rtc.h
3071 create mode 100644 tools/kvm/include/kvm/rwsem.h
3072 create mode 100644 tools/kvm/include/kvm/sdl.h
3073 create mode 100644 tools/kvm/include/kvm/segment.h
3074 create mode 100644 tools/kvm/include/kvm/strbuf.h
3075 create mode 100644 tools/kvm/include/kvm/symbol.h
3076 create mode 100644 tools/kvm/include/kvm/term.h
3077 create mode 100644 tools/kvm/include/kvm/threadpool.h
3078 create mode 100644 tools/kvm/include/kvm/types.h
3079 create mode 100644 tools/kvm/include/kvm/uip.h
3080 create mode 100644 tools/kvm/include/kvm/util-init.h
3081 create mode 100644 tools/kvm/include/kvm/util.h
3082 create mode 100644 tools/kvm/include/kvm/vesa.h
3083 create mode 100644 tools/kvm/include/kvm/virtio-9p.h
3084 create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
3085 create mode 100644 tools/kvm/include/kvm/virtio-blk.h
3086 create mode 100644 tools/kvm/include/kvm/virtio-console.h
3087 create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
3088 create mode 100644 tools/kvm/include/kvm/virtio-net.h
3089 create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
3090 create mode 100644 tools/kvm/include/kvm/virtio-pci.h
3091 create mode 100644 tools/kvm/include/kvm/virtio-rng.h
3092 create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
3093 create mode 100644 tools/kvm/include/kvm/virtio.h
3094 create mode 100644 tools/kvm/include/kvm/vnc.h
3095 create mode 100644 tools/kvm/include/linux/bitops.h
3096 create mode 100644 tools/kvm/include/linux/byteorder.h
3097 create mode 100644 tools/kvm/include/linux/compiler.h
3098 create mode 100644 tools/kvm/include/linux/kernel.h
3099 create mode 100644 tools/kvm/include/linux/module.h
3100 create mode 100644 tools/kvm/include/linux/prefetch.h
3101 create mode 100644 tools/kvm/include/linux/stddef.h
3102 create mode 100644 tools/kvm/include/linux/types.h
3103 create mode 100644 tools/kvm/ioeventfd.c
3104 create mode 100644 tools/kvm/ioport.c
3105 create mode 100644 tools/kvm/kvm-cmd.c
3106 create mode 100644 tools/kvm/kvm-cpu.c
3107 create mode 100644 tools/kvm/kvm-ipc.c
3108 create mode 100644 tools/kvm/kvm.c
3109 create mode 100644 tools/kvm/main.c
3110 create mode 100644 tools/kvm/mmio.c
3111 create mode 100644 tools/kvm/net/uip/arp.c
3112 create mode 100644 tools/kvm/net/uip/buf.c
3113 create mode 100644 tools/kvm/net/uip/core.c
3114 create mode 100644 tools/kvm/net/uip/csum.c
3115 create mode 100644 tools/kvm/net/uip/dhcp.c
3116 create mode 100644 tools/kvm/net/uip/icmp.c
3117 create mode 100644 tools/kvm/net/uip/ipv4.c
3118 create mode 100644 tools/kvm/net/uip/tcp.c
3119 create mode 100644 tools/kvm/net/uip/udp.c
3120 create mode 100644 tools/kvm/pci.c
3121 create mode 100644 tools/kvm/powerpc/boot.c
3122 create mode 100644 tools/kvm/powerpc/cpu_info.c
3123 create mode 100644 tools/kvm/powerpc/cpu_info.h
3124 create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
3125 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
3126 create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
3127 create mode 100644 tools/kvm/powerpc/ioport.c
3128 create mode 100644 tools/kvm/powerpc/irq.c
3129 create mode 100644 tools/kvm/powerpc/kvm-cpu.c
3130 create mode 100644 tools/kvm/powerpc/kvm.c
3131 create mode 100644 tools/kvm/powerpc/spapr.h
3132 create mode 100644 tools/kvm/powerpc/spapr_hcall.c
3133 create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
3134 create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
3135 create mode 100644 tools/kvm/powerpc/spapr_pci.c
3136 create mode 100644 tools/kvm/powerpc/spapr_pci.h
3137 create mode 100644 tools/kvm/powerpc/spapr_rtas.c
3138 create mode 100644 tools/kvm/powerpc/xics.c
3139 create mode 100644 tools/kvm/powerpc/xics.h
3140 create mode 100644 tools/kvm/symbol.c
3141 create mode 100644 tools/kvm/term.c
3142 create mode 100644 tools/kvm/tests/Makefile
3143 create mode 100644 tools/kvm/tests/boot/Makefile
3144 create mode 100644 tools/kvm/tests/boot/init.c
3145 create mode 100644 tools/kvm/tests/kernel/.gitignore
3146 create mode 100644 tools/kvm/tests/kernel/Makefile
3147 create mode 100644 tools/kvm/tests/kernel/README
3148 create mode 100644 tools/kvm/tests/kernel/kernel.S
3149 create mode 100644 tools/kvm/tests/pit/.gitignore
3150 create mode 100644 tools/kvm/tests/pit/Makefile
3151 create mode 100644 tools/kvm/tests/pit/README
3152 create mode 100644 tools/kvm/tests/pit/tick.S
3153 create mode 100644 tools/kvm/ui/sdl.c
3154 create mode 100644 tools/kvm/ui/vnc.c
3155 create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
3156 create mode 100755 tools/kvm/util/generate-cmdlist.sh
3157 create mode 100644 tools/kvm/util/init.c
3158 create mode 100755 tools/kvm/util/kvm-ifup-vbr0
3159 create mode 100644 tools/kvm/util/parse-options.c
3160 create mode 100644 tools/kvm/util/rbtree-interval.c
3161 create mode 100644 tools/kvm/util/read-write.c
3162 create mode 100755 tools/kvm/util/set_private_br.sh
3163 create mode 100644 tools/kvm/util/strbuf.c
3164 create mode 100644 tools/kvm/util/threadpool.c
3165 create mode 100644 tools/kvm/util/util.c
3166 create mode 100644 tools/kvm/virtio/9p-pdu.c
3167 create mode 100644 tools/kvm/virtio/9p.c
3168 create mode 100644 tools/kvm/virtio/balloon.c
3169 create mode 100644 tools/kvm/virtio/blk.c
3170 create mode 100644 tools/kvm/virtio/console.c
3171 create mode 100644 tools/kvm/virtio/core.c
3172 create mode 100644 tools/kvm/virtio/mmio.c
3173 create mode 100644 tools/kvm/virtio/net.c
3174 create mode 100644 tools/kvm/virtio/pci.c
3175 create mode 100644 tools/kvm/virtio/rng.c
3176 create mode 100644 tools/kvm/virtio/scsi.c
3177 create mode 100644 tools/kvm/x86/bios.c
3178 create mode 100644 tools/kvm/x86/bios/.gitignore
3179 create mode 100644 tools/kvm/x86/bios/bios-rom.S
3180 create mode 100644 tools/kvm/x86/bios/e820.c
3181 create mode 100644 tools/kvm/x86/bios/entry.S
3182 create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
3183 create mode 100644 tools/kvm/x86/bios/int10.c
3184 create mode 100644 tools/kvm/x86/bios/int15.c
3185 create mode 100644 tools/kvm/x86/bios/local.S
3186 create mode 100644 tools/kvm/x86/bios/macro.S
3187 create mode 100644 tools/kvm/x86/bios/memcpy.c
3188 create mode 100644 tools/kvm/x86/bios/rom.ld.S
3189 create mode 100644 tools/kvm/x86/boot.c
3190 create mode 100644 tools/kvm/x86/cpuid.c
3191 create mode 100644 tools/kvm/x86/include/kvm/assembly.h
3192 create mode 100644 tools/kvm/x86/include/kvm/barrier.h
3193 create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
3194 create mode 100644 tools/kvm/x86/include/kvm/bios.h
3195 create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
3196 create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
3197 create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
3198 create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
3199 create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
3200 create mode 100644 tools/kvm/x86/include/kvm/mptable.h
3201 create mode 100644 tools/kvm/x86/interrupt.c
3202 create mode 100644 tools/kvm/x86/ioport.c
3203 create mode 100644 tools/kvm/x86/irq.c
3204 create mode 100644 tools/kvm/x86/kvm-cpu.c
3205 create mode 100644 tools/kvm/x86/kvm.c
3206 create mode 100644 tools/kvm/x86/mptable.c
3207 create mode 100644 tools/perf/Documentation/android.txt
3208 create mode 100644 tools/perf/arch/common.c
3209 create mode 100644 tools/perf/arch/common.h
3210 create mode 100644 tools/perf/util/machine.c
3211 create mode 100644 tools/perf/util/machine.h
3212 Merging rcu/rcu/next (495f365 Merge branches 'doc.2012.10.23c', 'fixes.2012.10.27a', 'srcu.2012.10.27a', 'stall.2012.10.24a', 'tracing.2012.10.27a' and 'idle.2012.10.24a' into HEAD)
3213 $ git merge rcu/rcu/next
3214 Auto-merging kernel/sched/core.c
3215 Auto-merging kernel/cpu.c
3216 Auto-merging init/Kconfig
3217 Auto-merging include/linux/sched.h
3218 Merge made by the 'recursive' strategy.
3219 Documentation/RCU/RTFP.txt | 2 +-
3220 Documentation/RCU/checklist.txt | 17 +-
3221 Documentation/RCU/listRCU.txt | 2 +-
3222 Documentation/RCU/whatisRCU.txt | 17 +-
3223 Documentation/memory-barriers.txt | 9 +-
3224 arch/um/drivers/mconsole_kern.c | 2 +-
3225 arch/x86/kernel/ptrace.c | 7 +
3226 include/linux/rculist.h | 17 --
3227 include/linux/rcupdate.h | 22 +++
3228 include/linux/sched.h | 10 +-
3229 include/linux/srcu.h | 34 ++++
3230 init/Kconfig | 19 ++-
3232 kernel/ksysfs.c | 18 +++
3234 kernel/rcupdate.c | 54 +++++++
3235 kernel/rcutiny.c | 6 +-
3236 kernel/rcutiny_plugin.h | 61 ++++++-
3237 kernel/rcutorture.c | 54 +++----
3238 kernel/rcutree.c | 253 ++++++++++++++++++-----------
3239 kernel/rcutree.h | 24 +--
3240 kernel/rcutree_plugin.h | 18 ++-
3241 kernel/rcutree_trace.c | 322 ++++++++++++++++++-------------------
3242 kernel/sched/core.c | 8 +-
3243 kernel/srcu.c | 16 +-
3244 lib/Kconfig.debug | 4 +-
3245 26 files changed, 642 insertions(+), 372 deletions(-)
3246 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
3247 $ git merge cputime/cputime
3249 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
3250 $ git merge uprobes/for-next
3252 Merging kvm/linux-next (8ca40a7 KVM: Take kvm instead of vcpu to mmu_notifier_retry)
3253 $ git merge kvm/linux-next
3254 Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
3255 Resolved 'arch/powerpc/include/asm/kvm_para.h' using previous resolution.
3256 Auto-merging include/uapi/linux/kvm.h
3257 Auto-merging arch/x86/kvm/mmu.c
3258 Auto-merging arch/powerpc/kvm/trace.h
3259 Auto-merging arch/powerpc/kvm/book3s_hv.c
3260 Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
3261 Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
3262 Auto-merging arch/powerpc/kernel/ppc_ksyms.c
3263 Auto-merging arch/powerpc/include/uapi/asm/kvm.h
3264 Auto-merging arch/powerpc/include/asm/kvm_para.h
3265 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h
3266 Auto-merging arch/powerpc/include/asm/kvm_book3s.h
3267 Auto-merging arch/powerpc/include/asm/Kbuild
3268 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
3269 Automatic merge failed; fix conflicts and then commit the result.
3271 [master 10b95bb] Merge remote-tracking branch 'kvm/linux-next'
3272 $ git diff -M --stat --summary HEAD^..
3273 Documentation/virtual/kvm/api.txt | 82 ++++++-
3274 arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
3275 arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
3276 arch/powerpc/include/asm/kvm_book3s.h | 2 +-
3277 arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
3278 arch/powerpc/include/asm/kvm_host.h | 38 ++-
3279 arch/powerpc/include/asm/kvm_para.h | 15 +-
3280 arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
3281 arch/powerpc/include/asm/reg_booke.h | 7 +
3282 arch/powerpc/include/uapi/asm/kvm.h | 59 +++++
3283 arch/powerpc/kernel/epapr_hcalls.S | 28 +++
3284 arch/powerpc/kernel/epapr_paravirt.c | 11 +-
3285 arch/powerpc/kernel/kvm.c | 2 +-
3286 arch/powerpc/kernel/ppc_ksyms.c | 5 +
3287 arch/powerpc/kvm/44x.c | 1 +
3288 arch/powerpc/kvm/44x_emulate.c | 110 +++++----
3289 arch/powerpc/kvm/Kconfig | 3 +
3290 arch/powerpc/kvm/book3s.c | 125 ++++++++++
3291 arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
3292 arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
3293 arch/powerpc/kvm/book3s_64_mmu_hv.c | 67 ++++--
3294 arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
3295 arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
3296 arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
3297 arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
3298 arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
3299 arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
3300 arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
3301 arch/powerpc/kvm/booke_emulate.c | 22 +-
3302 arch/powerpc/kvm/e500.h | 3 +-
3303 arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
3304 arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
3305 arch/powerpc/kvm/trace.h | 200 +++++++++++++---
3306 arch/powerpc/platforms/Kconfig | 1 +
3307 arch/powerpc/sysdev/fsl_msi.c | 9 +-
3308 arch/powerpc/sysdev/fsl_soc.c | 2 +
3309 arch/s390/kvm/interrupt.c | 19 +-
3310 arch/s390/kvm/kvm-s390.c | 2 +-
3311 arch/x86/kvm/mmu.c | 45 ++--
3312 arch/x86/kvm/paging_tmpl.h | 115 ++++-----
3313 arch/x86/kvm/svm.c | 7 +-
3314 arch/x86/kvm/vmx.c | 45 ++--
3315 arch/x86/kvm/x86.c | 14 +-
3316 drivers/tty/Kconfig | 1 +
3317 drivers/virt/Kconfig | 1 +
3318 include/linux/kvm_host.h | 8 +-
3319 include/uapi/linux/kvm.h | 18 +-
3320 virt/kvm/iommu.c | 6 +-
3321 48 files changed, 1806 insertions(+), 508 deletions(-)
3322 $ git am -3 ../patches/0001-KVM-PPC-fix-fallout-from-UAPI-changes.patch
3323 Applying: KVM: PPC: fix fallout from UAPI changes
3325 Unstaged changes after reset:
3326 D arch/powerpc/include/asm/epapr_hcalls.h
3327 M arch/powerpc/include/uapi/asm/Kbuild
3328 M arch/powerpc/include/uapi/asm/kvm_para.h
3330 $ git commit -v -a --amend
3331 [master 4c44578] Merge remote-tracking branch 'kvm/linux-next'
3332 Merging kvm-ppc/kvm-ppc-next (4c3d168 KVM: PPC: Move mtspr/mfspr emulation into own functions)
3333 $ git merge kvm-ppc/kvm-ppc-next
3334 Merge made by the 'recursive' strategy.
3335 Documentation/virtual/kvm/api.txt | 3 +-
3336 arch/powerpc/kvm/44x_emulate.c | 2 +
3337 arch/powerpc/kvm/emulate.c | 221 ++++++++++++++++++++-----------------
3338 3 files changed, 125 insertions(+), 101 deletions(-)
3339 Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
3340 $ git merge oprofile/for-next
3342 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
3343 $ git merge xen/upstream/xen
3345 Merging xen-two/linux-next (ad50261 Merge branch 'stable/for-linus-3.7' into linux-next)
3346 $ git merge xen-two/linux-next
3347 Merge made by the 'recursive' strategy.
3348 drivers/net/xen-netback/netback.c | 11 ++++++--
3349 drivers/xen/grant-table.c | 53 ------------------------------------
3350 drivers/xen/xenbus/xenbus_client.c | 6 ++--
3351 include/xen/grant_table.h | 12 --------
3352 4 files changed, 12 insertions(+), 70 deletions(-)
3353 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
3354 $ git merge xen-pvhvm/linux-next
3356 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
3357 $ git merge percpu/for-next
3359 Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
3360 $ git merge workqueues/for-next
3361 Merge made by the 'recursive' strategy.
3362 kernel/workqueue.c | 12 +++++++++---
3363 1 file changed, 9 insertions(+), 3 deletions(-)
3364 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
3365 $ git merge drivers-x86/linux-next
3366 Auto-merging drivers/platform/x86/asus-wmi.c
3367 Merge made by the 'recursive' strategy.
3368 drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
3369 1 file changed, 76 insertions(+)
3370 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
3371 $ git merge hwpoison/hwpoison
3373 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
3374 $ git merge sysctl/master
3376 Merging regmap/for-next (97f99c4 Merge tag 'regmap-fix-mmio' into regmap-next)
3377 $ git merge regmap/for-next
3378 Merge made by the 'recursive' strategy.
3379 drivers/base/regmap/internal.h | 4 +--
3380 drivers/base/regmap/regmap-irq.c | 19 +++++++++++
3381 drivers/base/regmap/regmap.c | 67 ++++++++++++++++++++++----------------
3382 include/linux/regmap.h | 18 +++++++++-
3383 4 files changed, 76 insertions(+), 32 deletions(-)
3384 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
3385 $ git merge hsi/for-next
3387 Merging leds/for-next (1d4badc leds: ledtrig-gpio: replace strict_strtoul() with kstrtoul())
3388 $ git merge leds/for-next
3389 Merge made by the 'recursive' strategy.
3390 drivers/leds/leds-bd2802.c | 4 ++--
3391 drivers/leds/leds-cobalt-qube.c | 11 ++++-------
3392 drivers/leds/leds-cobalt-raq.c | 11 ++++-------
3393 drivers/leds/leds-fsg.c | 15 +++++----------
3394 drivers/leds/leds-gpio.c | 12 +++++-------
3395 drivers/leds/leds-lm355x.c | 2 +-
3396 drivers/leds/leds-lm3642.c | 8 ++++----
3397 drivers/leds/leds-lt3593.c | 9 +++------
3398 drivers/leds/leds-netxbig.c | 2 +-
3399 drivers/leds/leds-ns2.c | 23 ++++++++---------------
3400 drivers/leds/leds-renesas-tpu.c | 25 ++++++++++---------------
3401 drivers/leds/leds-ss4200.c | 2 +-
3402 drivers/leds/ledtrig-backlight.c | 2 +-
3403 drivers/leds/ledtrig-gpio.c | 2 +-
3404 14 files changed, 50 insertions(+), 78 deletions(-)
3405 Merging driver-core/driver-core-next (967857d drivers/base: remove CONFIG_EXPERIMENTAL)
3406 $ git merge driver-core/driver-core-next
3407 Auto-merging drivers/base/Kconfig
3408 Merge made by the 'recursive' strategy.
3409 drivers/base/Kconfig | 7 +++----
3410 1 file changed, 3 insertions(+), 4 deletions(-)
3411 Merging tty/tty-next (84fd7bd tty: Add get- ioctls to fetch tty status v3)
3412 $ git merge tty/tty-next
3413 Auto-merging fs/compat_ioctl.c
3414 Auto-merging drivers/tty/serial/omap-serial.c
3415 Merge made by the 'recursive' strategy.
3416 .../devicetree/bindings/tty/serial/of-serial.txt | 5 +-
3417 arch/alpha/include/asm/ioctls.h | 3 +
3418 arch/arm/plat-omap/include/plat/serial.h | 9 -
3419 arch/mips/include/uapi/asm/ioctls.h | 3 +
3420 arch/parisc/include/uapi/asm/ioctls.h | 3 +
3421 arch/powerpc/include/uapi/asm/ioctls.h | 3 +
3422 arch/sh/include/uapi/asm/ioctls.h | 3 +
3423 arch/sparc/include/uapi/asm/ioctls.h | 3 +
3424 arch/x86/platform/ce4100/ce4100.c | 3 +
3425 arch/xtensa/include/uapi/asm/ioctls.h | 3 +
3426 drivers/bluetooth/hci_ldisc.c | 7 +-
3427 drivers/staging/dgrp/dgrp_common.h | 1 -
3428 drivers/staging/dgrp/dgrp_driver.c | 4 -
3429 drivers/staging/dgrp/dgrp_net_ops.c | 67 +-
3430 drivers/staging/dgrp/dgrp_specproc.c | 2 -
3431 drivers/staging/dgrp/dgrp_sysfs.c | 18 -
3432 drivers/tty/hvc/hvcs.c | 4 +-
3433 drivers/tty/n_tty.c | 752 +++++++++++---------
3434 drivers/tty/pty.c | 77 +-
3435 drivers/tty/serial/8250/8250.c | 9 +-
3436 drivers/tty/serial/8250/8250.h | 36 +
3437 drivers/tty/serial/8250/8250_dw.c | 25 +
3438 drivers/tty/serial/8250/8250_early.c | 2 +-
3439 drivers/tty/serial/8250/8250_pci.c | 6 +-
3440 drivers/tty/serial/amba-pl011.c | 25 +-
3441 drivers/tty/serial/clps711x.c | 595 +++++++---------
3442 drivers/tty/serial/ifx6x60.c | 76 +-
3443 drivers/tty/serial/ifx6x60.h | 1 +
3444 drivers/tty/serial/of_serial.c | 32 +-
3445 drivers/tty/serial/omap-serial.c | 20 +-
3446 drivers/tty/serial/pxa.c | 55 ++
3447 drivers/tty/serial/samsung.c | 16 +-
3448 drivers/tty/serial/vt8500_serial.c | 8 +-
3449 drivers/tty/tty_audit.c | 15 +-
3450 drivers/tty/tty_buffer.c | 228 +++---
3451 drivers/tty/tty_io.c | 20 +-
3452 drivers/tty/tty_ioctl.c | 21 -
3453 drivers/tty/tty_ldisc.c | 47 +-
3454 drivers/tty/tty_mutex.c | 4 +-
3455 drivers/tty/tty_port.c | 2 +
3456 drivers/tty/vt/selection.c | 9 +-
3457 fs/compat_ioctl.c | 3 +
3458 fs/devpts/inode.c | 61 +-
3459 include/linux/devpts_fs.h | 20 +-
3460 include/linux/tty.h | 44 +-
3461 include/linux/tty_flip.h | 2 +-
3462 include/uapi/asm-generic/ioctls.h | 3 +
3463 kernel/auditsc.c | 2 +-
3464 kernel/printk.c | 12 +-
3465 49 files changed, 1284 insertions(+), 1085 deletions(-)
3466 Merging usb/usb-next (d124a60 USB: isp1760-if: Change to use irq_of_parse_and_map)
3467 $ git merge usb/usb-next
3468 Resolved 'drivers/usb/misc/ezusb.c' using previous resolution.
3469 Auto-merging drivers/usb/misc/ezusb.c
3470 CONFLICT (content): Merge conflict in drivers/usb/misc/ezusb.c
3471 Removing drivers/usb/host/ohci-xls.c
3472 Removing drivers/usb/host/ohci-sh.c
3473 Removing drivers/usb/host/ohci-ppc-soc.c
3474 Removing drivers/usb/host/ohci-pnx8550.c
3475 Removing drivers/usb/host/ohci-cns3xxx.c
3476 Removing drivers/usb/host/ohci-au1xxx.c
3477 Removing drivers/usb/host/ehci-xls.c
3478 Removing drivers/usb/host/ehci-ls1x.c
3479 Removing drivers/usb/host/ehci-ixp4xx.c
3480 Removing drivers/usb/host/ehci-cns3xxx.c
3481 Removing drivers/usb/host/ehci-au1xxx.c
3482 Auto-merging drivers/usb/core/hub.c
3483 Automatic merge failed; fix conflicts and then commit the result.
3485 [master ef5db57] Merge remote-tracking branch 'usb/usb-next'
3486 $ git diff -M --stat --summary HEAD^..
3487 Documentation/usb/error-codes.txt | 5 +-
3488 arch/arm/mach-cns3xxx/cns3420vb.c | 54 ++++-
3489 arch/mips/alchemy/common/Makefile | 2 +-
3490 arch/mips/alchemy/common/platform.c | 58 ++++-
3491 .../mips/alchemy/common/usb.c | 0
3492 arch/mips/configs/db1000_defconfig | 1 +
3493 arch/mips/configs/db1235_defconfig | 2 +
3494 arch/mips/configs/gpr_defconfig | 1 +
3495 arch/mips/configs/ls1b_defconfig | 1 +
3496 arch/mips/configs/mtx1_defconfig | 1 +
3497 arch/mips/loongson1/common/platform.c | 8 +-
3498 arch/mips/netlogic/xlr/platform.c | 17 +-
3499 arch/mips/pnx8550/common/platform.c | 31 ++-
3500 arch/sh/kernel/cpu/sh3/setup-sh7720.c | 6 +-
3501 arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 +-
3502 arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 6 +-
3503 arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 6 +-
3504 drivers/usb/core/devices.c | 18 +-
3505 drivers/usb/core/hcd.c | 19 +-
3506 drivers/usb/core/hub.c | 75 ++++++
3507 drivers/usb/core/urb.c | 22 +-
3508 drivers/usb/core/usb.c | 4 +-
3509 drivers/usb/host/Kconfig | 28 +--
3510 drivers/usb/host/Makefile | 1 -
3511 drivers/usb/host/ehci-au1xxx.c | 184 ---------------
3512 drivers/usb/host/ehci-cns3xxx.c | 155 -------------
3513 drivers/usb/host/ehci-dbg.c | 15 --
3514 drivers/usb/host/ehci-hcd.c | 54 ++---
3515 drivers/usb/host/ehci-hub.c | 23 +-
3516 drivers/usb/host/ehci-ixp4xx.c | 139 -----------
3517 drivers/usb/host/ehci-lpm.c | 23 +-
3518 drivers/usb/host/ehci-ls1x.c | 147 ------------
3519 drivers/usb/host/ehci-pci.c | 17 --
3520 drivers/usb/host/ehci-platform.c | 24 +-
3521 drivers/usb/host/ehci-s5p.c | 10 +-
3522 drivers/usb/host/ehci-sched.c | 132 +++++------
3523 drivers/usb/host/ehci-tegra.c | 5 +-
3524 drivers/usb/host/ehci-vt8500.c | 16 --
3525 drivers/usb/host/ehci-w90x900.c | 2 +-
3526 drivers/usb/host/ehci-xls.c | 142 ------------
3527 drivers/usb/host/ehci.h | 28 ++-
3528 drivers/usb/host/isp1760-if.c | 7 +-
3529 drivers/usb/host/ohci-at91.c | 2 +-
3530 drivers/usb/host/ohci-au1xxx.c | 234 -------------------
3531 drivers/usb/host/ohci-cns3xxx.c | 166 -------------
3532 drivers/usb/host/ohci-ep93xx.c | 2 +-
3533 drivers/usb/host/ohci-exynos.c | 22 +-
3534 drivers/usb/host/ohci-hcd.c | 139 ++++++++---
3535 drivers/usb/host/ohci-hub.c | 42 ----
3536 drivers/usb/host/ohci-omap.c | 2 +-
3537 drivers/usb/host/ohci-pci.c | 47 +---
3538 drivers/usb/host/ohci-platform.c | 28 +--
3539 drivers/usb/host/ohci-pnx8550.c | 243 --------------------
3540 drivers/usb/host/ohci-ppc-soc.c | 216 -----------------
3541 drivers/usb/host/ohci-pxa27x.c | 2 +-
3542 drivers/usb/host/ohci-q.c | 4 +-
3543 drivers/usb/host/ohci-s3c2410.c | 35 +--
3544 drivers/usb/host/ohci-sh.c | 141 ------------
3545 drivers/usb/host/ohci-sm501.c | 2 +-
3546 drivers/usb/host/ohci-spear.c | 2 +-
3547 drivers/usb/host/ohci-tmio.c | 2 +-
3548 drivers/usb/host/ohci-xls.c | 152 ------------
3549 drivers/usb/host/r8a66597-hcd.c | 6 +-
3550 drivers/usb/host/uhci-q.c | 73 +++---
3551 drivers/usb/misc/ezusb.c | 38 +--
3552 drivers/usb/phy/tegra_usb_phy.c | 4 +-
3553 drivers/usb/serial/ftdi_sio.c | 60 +++++
3554 drivers/usb/usb-skeleton.c | 13 +-
3555 drivers/usb/wusbcore/devconnect.c | 13 --
3556 drivers/uwb/umc-bus.c | 2 +-
3557 include/linux/usb.h | 34 +--
3558 include/linux/usb/ehci_pdriver.h | 3 +
3559 include/linux/usb/ezusb.h | 8 -
3560 include/linux/usb/ohci_pdriver.h | 2 +
3561 74 files changed, 776 insertions(+), 2458 deletions(-)
3562 rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
3563 delete mode 100644 drivers/usb/host/ehci-au1xxx.c
3564 delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
3565 delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
3566 delete mode 100644 drivers/usb/host/ehci-ls1x.c
3567 delete mode 100644 drivers/usb/host/ehci-xls.c
3568 delete mode 100644 drivers/usb/host/ohci-au1xxx.c
3569 delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
3570 delete mode 100644 drivers/usb/host/ohci-pnx8550.c
3571 delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
3572 delete mode 100644 drivers/usb/host/ohci-sh.c
3573 delete mode 100644 drivers/usb/host/ohci-xls.c
3574 Merging staging/staging-next (d9ff393 Staging: csr: remove CSRMIN() macro)
3575 $ git merge staging/staging-next
3576 Resolved 'drivers/staging/comedi/drivers/amplc_dio200.c' using previous resolution.
3577 Removing drivers/staging/telephony/phonedev.c
3578 Removing drivers/staging/telephony/ixj_pcmcia.c
3579 Removing drivers/staging/telephony/ixj.h
3580 Removing drivers/staging/telephony/ixj.c
3581 Removing drivers/staging/telephony/ixj-ver.h
3582 Removing drivers/staging/telephony/TODO
3583 Removing drivers/staging/telephony/Makefile
3584 Removing drivers/staging/telephony/Kconfig
3585 Removing drivers/staging/rts_pstor/xd.h
3586 Removing drivers/staging/rts_pstor/xd.c
3587 Removing drivers/staging/rts_pstor/trace.h
3588 Removing drivers/staging/rts_pstor/spi.h
3589 Removing drivers/staging/rts_pstor/spi.c
3590 Removing drivers/staging/rts_pstor/sd.h
3591 Removing drivers/staging/rts_pstor/sd.c
3592 Removing drivers/staging/rts_pstor/rtsx_transport.h
3593 Removing drivers/staging/rts_pstor/rtsx_transport.c
3594 Removing drivers/staging/rts_pstor/rtsx_sys.h
3595 Removing drivers/staging/rts_pstor/rtsx_scsi.h
3596 Removing drivers/staging/rts_pstor/rtsx_scsi.c
3597 Removing drivers/staging/rts_pstor/rtsx_chip.h
3598 Removing drivers/staging/rts_pstor/rtsx_chip.c
3599 Removing drivers/staging/rts_pstor/rtsx_card.h
3600 Removing drivers/staging/rts_pstor/rtsx_card.c
3601 Removing drivers/staging/rts_pstor/rtsx.h
3602 Removing drivers/staging/rts_pstor/rtsx.c
3603 Removing drivers/staging/rts_pstor/ms.h
3604 Removing drivers/staging/rts_pstor/ms.c
3605 Removing drivers/staging/rts_pstor/general.h
3606 Removing drivers/staging/rts_pstor/general.c
3607 Removing drivers/staging/rts_pstor/debug.h
3608 Removing drivers/staging/rts_pstor/TODO
3609 Removing drivers/staging/rts_pstor/Makefile
3610 Removing drivers/staging/rts_pstor/Kconfig
3611 Auto-merging drivers/staging/omapdrm/omap_gem.c
3612 Auto-merging drivers/staging/ipack/carriers/tpci200.h
3613 Auto-merging drivers/staging/ipack/carriers/tpci200.c
3614 Removing drivers/staging/ipack/bridges/Kconfig
3615 Auto-merging drivers/staging/iio/imu/adis16400_core.c
3616 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
3617 Auto-merging drivers/staging/iio/accel/adis16240_core.c
3618 Auto-merging drivers/staging/iio/accel/adis16220_core.c
3619 Auto-merging drivers/staging/iio/accel/adis16209_core.c
3620 Auto-merging drivers/staging/iio/accel/adis16204_core.c
3621 Auto-merging drivers/staging/iio/accel/adis16203_core.c
3622 Auto-merging drivers/staging/iio/accel/adis16201_core.c
3623 Auto-merging drivers/staging/dgrp/dgrp_sysfs.c
3624 Auto-merging drivers/staging/dgrp/dgrp_net_ops.c
3625 Removing drivers/staging/csr/csr_panic.h
3626 Removing drivers/staging/csr/csr_panic.c
3627 Auto-merging drivers/staging/comedi/drivers/ni_labpc.c
3628 Removing drivers/staging/comedi/drivers/mpc8260cpm.c
3629 Auto-merging drivers/staging/comedi/drivers/das08.c
3630 Auto-merging drivers/staging/comedi/drivers/amplc_pc263.c
3631 Auto-merging drivers/staging/comedi/drivers/amplc_pc236.c
3632 Auto-merging drivers/staging/comedi/drivers/amplc_dio200.c
3633 CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/amplc_dio200.c
3634 Auto-merging drivers/staging/comedi/drivers/8255_pci.c
3635 Auto-merging drivers/staging/android/binder.c
3636 Removing Documentation/telephony/ixj.txt
3637 Removing Documentation/telephony/00-INDEX
3638 Automatic merge failed; fix conflicts and then commit the result.
3640 [master c20bac1] Merge remote-tracking branch 'staging/staging-next'
3641 $ git diff -M --stat --summary HEAD^..
3642 Documentation/telephony/00-INDEX | 4 -
3643 Documentation/telephony/ixj.txt | 394 -
3644 drivers/iio/accel/Kconfig | 2 +-
3645 drivers/iio/adc/at91_adc.c | 21 +-
3646 drivers/iio/dac/Kconfig | 12 +-
3647 drivers/iio/dac/Makefile | 1 +
3648 drivers/iio/dac/ad5449.c | 375 +
3649 drivers/iio/dac/ad5686.c | 2 +-
3650 drivers/iio/industrialio-buffer.c | 6 +-
3651 drivers/iio/industrialio-core.c | 5 +
3652 drivers/iio/industrialio-event.c | 4 +-
3653 drivers/iio/inkern.c | 5 +-
3654 drivers/staging/Kconfig | 4 -
3655 drivers/staging/Makefile | 2 -
3656 drivers/staging/android/Makefile | 2 +
3657 drivers/staging/android/binder.c | 95 +-
3658 drivers/staging/android/binder_trace.h | 327 +
3659 drivers/staging/bcm/CmHost.c | 30 +-
3660 drivers/staging/bcm/InterfaceIdleMode.h | 5 +-
3661 drivers/staging/bcm/InterfaceMisc.c | 114 +-
3662 drivers/staging/bcm/LeakyBucket.c | 6 +-
3663 drivers/staging/bcm/Misc.c | 222 +-
3664 drivers/staging/bcm/Prototypes.h | 8 +-
3665 drivers/staging/ccg/ccg.c | 8 +-
3666 drivers/staging/ced1401/ced_ioc.c | 30 +-
3667 drivers/staging/ced1401/usb1401.c | 30 +-
3668 drivers/staging/comedi/Kconfig | 6 +-
3669 drivers/staging/comedi/comedi.h | 27 +-
3670 drivers/staging/comedi/comedidev.h | 25 +-
3671 drivers/staging/comedi/drivers.c | 1 +
3672 drivers/staging/comedi/drivers/8255_pci.c | 13 +-
3673 .../comedi/drivers/addi-data/APCI1710_82x54.c | 8 +-
3674 .../comedi/drivers/addi-data/APCI1710_Chrono.c | 7 +
3675 .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 +
3676 .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 42 +
3677 .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 5 +-
3678 .../comedi/drivers/addi-data/APCI1710_Pwm.c | 9 +-
3679 .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +
3680 .../comedi/drivers/addi-data/APCI1710_Tor.c | 5 +-
3681 .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 +
3682 .../staging/comedi/drivers/addi-data/addi_common.c | 68 +-
3683 .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 +
3684 .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +
3685 .../comedi/drivers/addi-data/hwdrv_APCI1710.h | 1 -
3686 .../comedi/drivers/addi-data/hwdrv_apci035.c | 14 +
3687 .../comedi/drivers/addi-data/hwdrv_apci035.h | 1 -
3688 .../comedi/drivers/addi-data/hwdrv_apci1032.c | 11 +-
3689 .../comedi/drivers/addi-data/hwdrv_apci1032.h | 1 -
3690 .../comedi/drivers/addi-data/hwdrv_apci1500.c | 19 +-
3691 .../comedi/drivers/addi-data/hwdrv_apci1500.h | 1 -
3692 .../comedi/drivers/addi-data/hwdrv_apci1516.c | 17 +-
3693 .../comedi/drivers/addi-data/hwdrv_apci1516.h | 1 -
3694 .../comedi/drivers/addi-data/hwdrv_apci1564.c | 16 +
3695 .../comedi/drivers/addi-data/hwdrv_apci1564.h | 1 -
3696 .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 4 +
3697 .../comedi/drivers/addi-data/hwdrv_apci2016.c | 12 +
3698 .../comedi/drivers/addi-data/hwdrv_apci2016.h | 1 -
3699 .../comedi/drivers/addi-data/hwdrv_apci2032.c | 14 +
3700 .../comedi/drivers/addi-data/hwdrv_apci2032.h | 1 -
3701 .../comedi/drivers/addi-data/hwdrv_apci2200.c | 19 +-
3702 .../comedi/drivers/addi-data/hwdrv_apci2200.h | 1 -
3703 .../comedi/drivers/addi-data/hwdrv_apci3120.c | 37 +-
3704 .../comedi/drivers/addi-data/hwdrv_apci3120.h | 1 -
3705 .../comedi/drivers/addi-data/hwdrv_apci3200.c | 28 +-
3706 .../comedi/drivers/addi-data/hwdrv_apci3200.h | 1 -
3707 .../comedi/drivers/addi-data/hwdrv_apci3501.c | 18 +
3708 .../comedi/drivers/addi-data/hwdrv_apci3501.h | 1 -
3709 .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 16 +
3710 drivers/staging/comedi/drivers/adl_pci6208.c | 10 +-
3711 drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 -
3712 drivers/staging/comedi/drivers/adl_pci8164.c | 14 +-
3713 drivers/staging/comedi/drivers/adl_pci9111.c | 9 +-
3714 drivers/staging/comedi/drivers/adl_pci9118.c | 10 +-
3715 drivers/staging/comedi/drivers/adq12b.c | 46 +-
3716 drivers/staging/comedi/drivers/adv_pci1710.c | 12 +-
3717 drivers/staging/comedi/drivers/adv_pci1723.c | 11 +-
3718 drivers/staging/comedi/drivers/adv_pci_dio.c | 12 +-
3719 drivers/staging/comedi/drivers/aio_aio12_8.c | 8 +-
3720 drivers/staging/comedi/drivers/aio_iiro_16.c | 19 +-
3721 drivers/staging/comedi/drivers/amplc_dio200.c | 1415 ++-
3722 drivers/staging/comedi/drivers/amplc_pc236.c | 26 +-
3723 drivers/staging/comedi/drivers/amplc_pc263.c | 1 -
3724 drivers/staging/comedi/drivers/amplc_pci224.c | 23 +-
3725 drivers/staging/comedi/drivers/amplc_pci230.c | 22 +-
3726 drivers/staging/comedi/drivers/cb_das16_cs.c | 5 +-
3727 drivers/staging/comedi/drivers/cb_pcidas.c | 13 +-
3728 drivers/staging/comedi/drivers/cb_pcidas64.c | 917 +-
3729 drivers/staging/comedi/drivers/cb_pcidda.c | 668 +-
3730 drivers/staging/comedi/drivers/cb_pcimdas.c | 108 +-
3731 drivers/staging/comedi/drivers/cb_pcimdda.c | 12 +-
3732 drivers/staging/comedi/drivers/comedi_bond.c | 8 +-
3733 drivers/staging/comedi/drivers/comedi_parport.c | 8 +-
3734 drivers/staging/comedi/drivers/comedi_test.c | 8 +-
3735 drivers/staging/comedi/drivers/contec_pci_dio.c | 2 -
3736 drivers/staging/comedi/drivers/daqboard2000.c | 10 +-
3737 drivers/staging/comedi/drivers/das08.c | 25 +-
3738 drivers/staging/comedi/drivers/das08_cs.c | 9 +-
3739 drivers/staging/comedi/drivers/das16.c | 23 +-
3740 drivers/staging/comedi/drivers/das16m1.c | 49 +-
3741 drivers/staging/comedi/drivers/das1800.c | 28 +-
3742 drivers/staging/comedi/drivers/das6402.c | 16 +-
3743 drivers/staging/comedi/drivers/das800.c | 35 +-
3744 drivers/staging/comedi/drivers/dmm32at.c | 27 +-
3745 drivers/staging/comedi/drivers/dt2801.c | 14 +-
3746 drivers/staging/comedi/drivers/dt2811.c | 13 +-
3747 drivers/staging/comedi/drivers/dt2814.c | 12 +-
3748 drivers/staging/comedi/drivers/dt2815.c | 9 +-
3749 drivers/staging/comedi/drivers/dt282x.c | 33 +-
3750 drivers/staging/comedi/drivers/dt3000.c | 560 +-
3751 drivers/staging/comedi/drivers/dt9812.c | 27 +-
3752 drivers/staging/comedi/drivers/dyna_pci10xx.c | 14 +-
3753 drivers/staging/comedi/drivers/fl512.c | 10 +-
3754 drivers/staging/comedi/drivers/gsc_hpdi.c | 369 +-
3755 drivers/staging/comedi/drivers/icp_multi.c | 9 +-
3756 drivers/staging/comedi/drivers/ii_pci20kc.c | 51 +-
3757 drivers/staging/comedi/drivers/jr3_pci.c | 37 +-
3758 drivers/staging/comedi/drivers/jr3_pci.h | 12 +-
3759 drivers/staging/comedi/drivers/ke_counter.c | 47 +-
3760 drivers/staging/comedi/drivers/me4000.c | 12 +-
3761 drivers/staging/comedi/drivers/me_daq.c | 627 +-
3762 drivers/staging/comedi/drivers/mpc624.c | 10 +-
3763 drivers/staging/comedi/drivers/mpc8260cpm.c | 164 -
3764 drivers/staging/comedi/drivers/multiq3.c | 11 +-
3765 drivers/staging/comedi/drivers/ni_6527.c | 23 +-
3766 drivers/staging/comedi/drivers/ni_65xx.c | 122 +-
3767 drivers/staging/comedi/drivers/ni_660x.c | 585 +-
3768 drivers/staging/comedi/drivers/ni_670x.c | 9 +-
3769 drivers/staging/comedi/drivers/ni_at_a2150.c | 20 +-
3770 drivers/staging/comedi/drivers/ni_at_ao.c | 13 +-
3771 drivers/staging/comedi/drivers/ni_atmio.c | 11 +-
3772 drivers/staging/comedi/drivers/ni_atmio16d.c | 15 +-
3773 drivers/staging/comedi/drivers/ni_daq_dio24.c | 14 +-
3774 drivers/staging/comedi/drivers/ni_labpc.c | 47 +-
3775 drivers/staging/comedi/drivers/ni_labpc_cs.c | 6 +-
3776 drivers/staging/comedi/drivers/ni_mio_common.c | 150 +-
3777 drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +-
3778 drivers/staging/comedi/drivers/ni_pcidio.c | 36 +-
3779 drivers/staging/comedi/drivers/ni_pcimio.c | 49 +-
3780 drivers/staging/comedi/drivers/pcl711.c | 15 +-
3781 drivers/staging/comedi/drivers/pcl726.c | 10 +-
3782 drivers/staging/comedi/drivers/pcl812.c | 27 +-
3783 drivers/staging/comedi/drivers/pcl816.c | 21 +-
3784 drivers/staging/comedi/drivers/pcl818.c | 32 +-
3785 drivers/staging/comedi/drivers/pcm3724.c | 44 +-
3786 drivers/staging/comedi/drivers/pcmad.c | 10 +-
3787 drivers/staging/comedi/drivers/pcmda12.c | 34 +-
3788 drivers/staging/comedi/drivers/pcmmio.c | 124 +-
3789 drivers/staging/comedi/drivers/pcmuio.c | 25 +-
3790 drivers/staging/comedi/drivers/poc.c | 15 +-
3791 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 34 +-
3792 drivers/staging/comedi/drivers/rtd520.c | 36 +-
3793 drivers/staging/comedi/drivers/rti800.c | 13 +-
3794 drivers/staging/comedi/drivers/rti802.c | 9 +-
3795 drivers/staging/comedi/drivers/s526.c | 8 +-
3796 drivers/staging/comedi/drivers/s626.c | 39 +-
3797 drivers/staging/comedi/drivers/serial2002.c | 44 +-
3798 drivers/staging/comedi/drivers/skel.c | 31 +-
3799 drivers/staging/comedi/drivers/ssv_dnp.c | 26 +-
3800 drivers/staging/comedi/drivers/unioxx5.c | 44 +-
3801 drivers/staging/comedi/drivers/usbdux.c | 10 +-
3802 drivers/staging/comedi/drivers/usbduxfast.c | 160 +-
3803 drivers/staging/comedi/drivers/vmk80xx.c | 13 +-
3804 .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 +-
3805 drivers/staging/crystalhd/crystalhd_cmds.c | 4 +-
3806 drivers/staging/csr/Makefile | 3 +-
3807 drivers/staging/csr/bh.c | 19 +-
3808 drivers/staging/csr/csr_framework_ext.c | 97 -
3809 drivers/staging/csr/csr_framework_ext.h | 213 -
3810 drivers/staging/csr/csr_framework_ext_types.h | 43 +-
3811 drivers/staging/csr/csr_lib.h | 8 -
3812 drivers/staging/csr/csr_log.h | 172 +-
3813 drivers/staging/csr/csr_log_configure.h | 108 +-
3814 drivers/staging/csr/csr_log_text.h | 8 -
3815 drivers/staging/csr/csr_macro.h | 75 -
3816 drivers/staging/csr/csr_msg_transport.h | 8 -
3817 drivers/staging/csr/csr_msgconv.c | 1 -
3818 drivers/staging/csr/csr_msgconv.h | 9 -
3819 drivers/staging/csr/csr_panic.c | 20 -
3820 drivers/staging/csr/csr_panic.h | 53 -
3821 drivers/staging/csr/csr_prim_defs.h | 7 -
3822 drivers/staging/csr/csr_result.h | 8 -
3823 drivers/staging/csr/csr_sched.h | 215 +-
3824 drivers/staging/csr/csr_sdio.h | 8 -
3825 drivers/staging/csr/csr_time.c | 9 +-
3826 drivers/staging/csr/csr_time.h | 82 +-
3827 drivers/staging/csr/csr_wifi_common.h | 8 -
3828 drivers/staging/csr/csr_wifi_fsm.h | 8 -
3829 drivers/staging/csr/csr_wifi_fsm_event.h | 8 -
3830 drivers/staging/csr/csr_wifi_fsm_types.h | 10 -
3831 drivers/staging/csr/csr_wifi_hip_card.h | 9 -
3832 drivers/staging/csr/csr_wifi_hip_card_sdio.h | 8 -
3833 drivers/staging/csr/csr_wifi_hip_chiphelper.h | 64 -
3834 .../staging/csr/csr_wifi_hip_chiphelper_private.h | 8 -
3835 drivers/staging/csr/csr_wifi_hip_conversions.h | 8 -
3836 drivers/staging/csr/csr_wifi_hip_dump.c | 4 +-
3837 drivers/staging/csr/csr_wifi_hip_signals.h | 17 +-
3838 drivers/staging/csr/csr_wifi_hip_sigs.h | 8 -
3839 drivers/staging/csr/csr_wifi_hip_ta_sampling.h | 9 -
3840 drivers/staging/csr/csr_wifi_hip_unifi.h | 10 +-
3841 drivers/staging/csr/csr_wifi_hip_unifi_udi.h | 9 -
3842 drivers/staging/csr/csr_wifi_hip_unifihw.h | 8 -
3843 drivers/staging/csr/csr_wifi_hip_unifiversion.h | 8 -
3844 drivers/staging/csr/csr_wifi_hip_xbv.c | 2 +-
3845 drivers/staging/csr/csr_wifi_hip_xbv.h | 8 -
3846 drivers/staging/csr/csr_wifi_hostio_prim.h | 9 -
3847 drivers/staging/csr/csr_wifi_lib.h | 9 -
3848 drivers/staging/csr/csr_wifi_msgconv.h | 9 -
3849 .../staging/csr/csr_wifi_nme_ap_converter_init.h | 8 -
3850 drivers/staging/csr/csr_wifi_nme_ap_lib.h | 10 -
3851 drivers/staging/csr/csr_wifi_nme_ap_prim.h | 9 -
3852 drivers/staging/csr/csr_wifi_nme_ap_sef.h | 10 -
3853 drivers/staging/csr/csr_wifi_nme_ap_serialize.h | 9 -
3854 drivers/staging/csr/csr_wifi_nme_converter_init.h | 8 -
3855 drivers/staging/csr/csr_wifi_nme_lib.h | 9 -
3856 drivers/staging/csr/csr_wifi_nme_prim.h | 9 -
3857 drivers/staging/csr/csr_wifi_nme_serialize.h | 8 -
3858 drivers/staging/csr/csr_wifi_nme_task.h | 8 -
3859 drivers/staging/csr/csr_wifi_private_common.h | 8 -
3860 drivers/staging/csr/csr_wifi_result.h | 8 -
3861 .../staging/csr/csr_wifi_router_converter_init.h | 8 -
3862 .../csr/csr_wifi_router_ctrl_converter_init.h | 8 -
3863 drivers/staging/csr/csr_wifi_router_ctrl_lib.h | 10 -
3864 drivers/staging/csr/csr_wifi_router_ctrl_prim.h | 9 -
3865 drivers/staging/csr/csr_wifi_router_ctrl_sef.c | 67 +-
3866 drivers/staging/csr/csr_wifi_router_ctrl_sef.h | 7 -
3867 .../staging/csr/csr_wifi_router_ctrl_serialize.h | 8 -
3868 .../csr/csr_wifi_router_free_upstream_contents.c | 46 +-
3869 drivers/staging/csr/csr_wifi_router_lib.h | 10 -
3870 drivers/staging/csr/csr_wifi_router_prim.h | 9 -
3871 drivers/staging/csr/csr_wifi_router_sef.h | 8 -
3872 drivers/staging/csr/csr_wifi_router_serialize.h | 8 -
3873 drivers/staging/csr/csr_wifi_router_task.h | 8 -
3874 drivers/staging/csr/csr_wifi_sme_ap_lib.h | 9 -
3875 drivers/staging/csr/csr_wifi_sme_ap_prim.h | 8 -
3876 drivers/staging/csr/csr_wifi_sme_converter_init.h | 8 -
3877 drivers/staging/csr/csr_wifi_sme_lib.h | 10 -
3878 drivers/staging/csr/csr_wifi_sme_prim.h | 9 -
3879 drivers/staging/csr/csr_wifi_sme_sef.h | 213 +-
3880 drivers/staging/csr/csr_wifi_sme_serialize.h | 336 +-
3881 drivers/staging/csr/csr_wifi_sme_task.h | 16 +-
3882 drivers/staging/csr/csr_wifi_vif_utils.h | 81 -
3883 drivers/staging/csr/data_tx.c | 45 +-
3884 drivers/staging/csr/io.c | 1 -
3885 drivers/staging/csr/monitor.c | 1 -
3886 drivers/staging/csr/netdev.c | 9 +-
3887 drivers/staging/csr/sdio_mmc.c | 1 -
3888 drivers/staging/csr/sme_native.c | 1 -
3889 drivers/staging/csr/sme_sys.c | 11 +-
3890 drivers/staging/csr/sme_userspace.h | 2 +-
3891 drivers/staging/csr/ul_int.c | 1 -
3892 drivers/staging/csr/unifi_pdu_processing.c | 17 +-
3893 drivers/staging/csr/unifi_priv.h | 7 +-
3894 drivers/staging/csr/unifi_wext.h | 1 -
3895 drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +-
3896 drivers/staging/dgrp/dgrp_net_ops.c | 3 +
3897 drivers/staging/dgrp/dgrp_sysfs.c | 3 +-
3898 drivers/staging/et131x/et131x.c | 269 +-
3899 drivers/staging/gdm72xx/gdm_wimax.c | 5 +-
3900 drivers/staging/gdm72xx/sdio_boot.c | 81 +-
3901 drivers/staging/iio/accel/adis16201_core.c | 4 +-
3902 drivers/staging/iio/accel/adis16203_core.c | 2 -
3903 drivers/staging/iio/accel/adis16204_core.c | 4 +-
3904 drivers/staging/iio/accel/adis16209_core.c | 6 +-
3905 drivers/staging/iio/accel/adis16209_trigger.c | 11 +-
3906 drivers/staging/iio/accel/adis16220_core.c | 2 -
3907 drivers/staging/iio/accel/adis16240_core.c | 2 -
3908 drivers/staging/iio/accel/adis16240_trigger.c | 11 +-
3909 drivers/staging/iio/accel/kxsd9.c | 2 +-
3910 drivers/staging/iio/accel/lis3l02dq.h | 1 +
3911 drivers/staging/iio/accel/lis3l02dq_core.c | 10 +-
3912 drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +-
3913 drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
3914 drivers/staging/iio/adc/mxs-lradc.c | 2 +-
3915 drivers/staging/iio/cdc/ad7150.c | 12 +-
3916 drivers/staging/iio/cdc/ad7152.c | 2 +-
3917 drivers/staging/iio/cdc/ad7746.c | 2 +-
3918 drivers/staging/iio/gyro/adis16260_core.c | 6 +-
3919 drivers/staging/iio/iio_dummy_evgen.c | 2 +-
3920 drivers/staging/iio/imu/adis16400_core.c | 10 +-
3921 drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
3922 drivers/staging/iio/meter/ade7753.h | 2 -
3923 drivers/staging/iio/meter/ade7754.h | 2 -
3924 drivers/staging/iio/meter/ade7758.h | 3 -
3925 drivers/staging/iio/meter/ade7759.h | 2 -
3926 drivers/staging/iio/meter/ade7854.h | 2 -
3927 drivers/staging/imx-drm/ipu-v3/ipu-common.c | 28 +-
3928 drivers/staging/ipack/Kconfig | 15 +-
3929 drivers/staging/ipack/Makefile | 2 +-
3930 drivers/staging/ipack/bridges/Kconfig | 8 -
3931 drivers/staging/ipack/carriers/Kconfig | 7 +
3932 .../staging/ipack/{bridges => carriers}/Makefile | 0
3933 .../staging/ipack/{bridges => carriers}/tpci200.c | 309 +-
3934 .../staging/ipack/{bridges => carriers}/tpci200.h | 23 +-
3935 drivers/staging/ipack/devices/Kconfig | 1 -
3936 drivers/staging/ipack/devices/ipoctal.c | 118 +-
3937 drivers/staging/ipack/ipack.c | 45 +-
3938 drivers/staging/ipack/ipack.h | 58 +-
3939 drivers/staging/line6/audio.c | 8 +-
3940 drivers/staging/line6/driver.c | 20 +-
3941 drivers/staging/line6/driver.h | 2 -
3942 drivers/staging/olpc_dcon/olpc_dcon.c | 83 +-
3943 drivers/staging/olpc_dcon/olpc_dcon.h | 2 +-
3944 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 30 -
3945 drivers/staging/omapdrm/omap_crtc.c | 2 +-
3946 drivers/staging/omapdrm/omap_dmm_priv.h | 9 +-
3947 drivers/staging/omapdrm/omap_dmm_tiler.c | 106 +-
3948 drivers/staging/omapdrm/omap_dmm_tiler.h | 7 +-
3949 drivers/staging/omapdrm/omap_fb.c | 14 +-
3950 drivers/staging/omapdrm/omap_gem.c | 2 +-
3951 drivers/staging/rtl8192u/ieee80211/ieee80211.h | 5 +-
3952 drivers/staging/rtl8712/rtl871x_cmd.c | 4 +-
3953 drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
3954 drivers/staging/rts5139/Makefile | 22 +-
3955 drivers/staging/rts5139/ms.c | 96 +-
3956 drivers/staging/rts5139/ms.h | 18 +-
3957 drivers/staging/rts5139/ms_mg.c | 104 +-
3958 drivers/staging/rts5139/ms_mg.h | 14 +-
3959 drivers/staging/rts5139/rts51x.c | 10 +-
3960 drivers/staging/rts5139/rts51x_card.c | 80 +-
3961 drivers/staging/rts5139/rts51x_card.h | 30 +-
3962 drivers/staging/rts5139/rts51x_chip.c | 24 +-
3963 drivers/staging/rts5139/rts51x_chip.h | 16 +-
3964 drivers/staging/rts5139/rts51x_fop.c | 6 +-
3965 drivers/staging/rts5139/rts51x_scsi.c | 238 +-
3966 drivers/staging/rts5139/rts51x_scsi.h | 6 +-
3967 drivers/staging/rts5139/sd.c | 36 +-
3968 drivers/staging/rts5139/sd.h | 12 +-
3969 drivers/staging/rts5139/sd_cprm.c | 124 +-
3970 drivers/staging/rts5139/sd_cprm.h | 18 +-
3971 drivers/staging/rts5139/xd.c | 58 +-
3972 drivers/staging/rts5139/xd.h | 10 +-
3973 drivers/staging/rts_pstor/Kconfig | 16 -
3974 drivers/staging/rts_pstor/Makefile | 16 -
3975 drivers/staging/rts_pstor/TODO | 9 -
3976 drivers/staging/rts_pstor/debug.h | 43 -
3977 drivers/staging/rts_pstor/general.c | 35 -
3978 drivers/staging/rts_pstor/general.h | 31 -
3979 drivers/staging/rts_pstor/ms.c | 4051 --------
3980 drivers/staging/rts_pstor/ms.h | 225 -
3981 drivers/staging/rts_pstor/rtsx.c | 1105 --
3982 drivers/staging/rts_pstor/rtsx.h | 186 -
3983 drivers/staging/rts_pstor/rtsx_card.c | 1233 ---
3984 drivers/staging/rts_pstor/rtsx_card.h | 1093 --
3985 drivers/staging/rts_pstor/rtsx_chip.c | 2264 -----
3986 drivers/staging/rts_pstor/rtsx_chip.h | 989 --
3987 drivers/staging/rts_pstor/rtsx_scsi.c | 3137 ------
3988 drivers/staging/rts_pstor/rtsx_scsi.h | 142 -
3989 drivers/staging/rts_pstor/rtsx_sys.h | 50 -
3990 drivers/staging/rts_pstor/rtsx_transport.c | 769 --
3991 drivers/staging/rts_pstor/rtsx_transport.h | 66 -
3992 drivers/staging/rts_pstor/sd.c | 4570 ---------
3993 drivers/staging/rts_pstor/sd.h | 300 -
3994 drivers/staging/rts_pstor/spi.c | 812 --
3995 drivers/staging/rts_pstor/spi.h | 65 -
3996 drivers/staging/rts_pstor/trace.h | 93 -
3997 drivers/staging/rts_pstor/xd.c | 2052 ----
3998 drivers/staging/rts_pstor/xd.h | 188 -
3999 drivers/staging/sbe-2t3e3/cpld.c | 2 +-
4000 drivers/staging/sbe-2t3e3/main.c | 7 +-
4001 drivers/staging/sbe-2t3e3/module.c | 11 +-
4002 drivers/staging/sbe-2t3e3/netdev.c | 5 +-
4003 drivers/staging/silicom/bp_mod.c | 11 +-
4004 drivers/staging/silicom/bp_proc.c | 85 +-
4005 drivers/staging/silicom/bypasslib/bplibk.h | 1 +
4006 drivers/staging/silicom/bypasslib/bypass.c | 1 -
4007 drivers/staging/slicoss/slicoss.c | 160 +-
4008 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 24 +-
4009 drivers/staging/telephony/Kconfig | 47 -
4010 drivers/staging/telephony/Makefile | 7 -
4011 drivers/staging/telephony/TODO | 10 -
4012 drivers/staging/telephony/ixj-ver.h | 4 -
4013 drivers/staging/telephony/ixj.c |10571 --------------------
4014 drivers/staging/telephony/ixj.h | 1322 ---
4015 drivers/staging/telephony/ixj_pcmcia.c | 187 -
4016 drivers/staging/telephony/phonedev.c | 166 -
4017 drivers/staging/usbip/stub_dev.c | 13 +-
4018 drivers/staging/usbip/stub_rx.c | 5 +-
4019 drivers/staging/usbip/stub_tx.c | 3 +-
4020 drivers/staging/usbip/usbip_common.c | 40 +-
4021 drivers/staging/usbip/usbip_common.h | 4 +-
4022 drivers/staging/usbip/vhci.h | 1 -
4023 drivers/staging/usbip/vhci_hcd.c | 49 +-
4024 drivers/staging/usbip/vhci_rx.c | 2 +-
4025 drivers/staging/usbip/vhci_sysfs.c | 6 +-
4026 drivers/staging/usbip/vhci_tx.c | 2 +-
4027 drivers/staging/vt6655/hostap.c | 6 +-
4028 drivers/staging/vt6655/rxtx.c | 2 +-
4029 drivers/staging/vt6655/wcmd.c | 1 +
4030 drivers/staging/vt6656/device.h | 1 -
4031 drivers/staging/vt6656/firmware.c | 22 +-
4032 drivers/staging/vt6656/hostap.c | 6 +-
4033 drivers/staging/vt6656/main_usb.c | 1 -
4034 drivers/staging/vt6656/rf.c | 3 +
4035 drivers/staging/vt6656/rxtx.c | 2 +-
4036 drivers/staging/vt6656/usbpipe.c | 1 +
4037 drivers/staging/winbond/mds.c | 2 +-
4038 drivers/staging/winbond/wbhal.h | 4 +-
4039 drivers/staging/wlags49_h2/man/wlags49.4 | 2 +-
4040 drivers/staging/xgifb/TODO | 2 +-
4041 drivers/staging/xgifb/vb_setmode.c | 4 +-
4042 drivers/staging/zram/zram_drv.h | 4 +-
4043 drivers/vme/boards/vme_vmivme7805.c | 15 +-
4044 drivers/vme/bridges/vme_ca91cx42.c | 15 +-
4045 drivers/vme/bridges/vme_tsi148.c | 15 +-
4046 include/linux/iio/types.h | 1 +
4047 include/linux/platform_data/ad5449.h | 40 +
4048 406 files changed, 6905 insertions(+), 44117 deletions(-)
4049 delete mode 100644 Documentation/telephony/00-INDEX
4050 delete mode 100644 Documentation/telephony/ixj.txt
4051 create mode 100644 drivers/iio/dac/ad5449.c
4052 create mode 100644 drivers/staging/android/binder_trace.h
4053 delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
4054 delete mode 100644 drivers/staging/csr/csr_panic.c
4055 delete mode 100644 drivers/staging/csr/csr_panic.h
4056 delete mode 100644 drivers/staging/ipack/bridges/Kconfig
4057 create mode 100644 drivers/staging/ipack/carriers/Kconfig
4058 rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%)
4059 rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%)
4060 rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%)
4061 delete mode 100644 drivers/staging/rts_pstor/Kconfig
4062 delete mode 100644 drivers/staging/rts_pstor/Makefile
4063 delete mode 100644 drivers/staging/rts_pstor/TODO
4064 delete mode 100644 drivers/staging/rts_pstor/debug.h
4065 delete mode 100644 drivers/staging/rts_pstor/general.c
4066 delete mode 100644 drivers/staging/rts_pstor/general.h
4067 delete mode 100644 drivers/staging/rts_pstor/ms.c
4068 delete mode 100644 drivers/staging/rts_pstor/ms.h
4069 delete mode 100644 drivers/staging/rts_pstor/rtsx.c
4070 delete mode 100644 drivers/staging/rts_pstor/rtsx.h
4071 delete mode 100644 drivers/staging/rts_pstor/rtsx_card.c
4072 delete mode 100644 drivers/staging/rts_pstor/rtsx_card.h
4073 delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.c
4074 delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.h
4075 delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c
4076 delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h
4077 delete mode 100644 drivers/staging/rts_pstor/rtsx_sys.h
4078 delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.c
4079 delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.h
4080 delete mode 100644 drivers/staging/rts_pstor/sd.c
4081 delete mode 100644 drivers/staging/rts_pstor/sd.h
4082 delete mode 100644 drivers/staging/rts_pstor/spi.c
4083 delete mode 100644 drivers/staging/rts_pstor/spi.h
4084 delete mode 100644 drivers/staging/rts_pstor/trace.h
4085 delete mode 100644 drivers/staging/rts_pstor/xd.c
4086 delete mode 100644 drivers/staging/rts_pstor/xd.h
4087 delete mode 100644 drivers/staging/telephony/Kconfig
4088 delete mode 100644 drivers/staging/telephony/Makefile
4089 delete mode 100644 drivers/staging/telephony/TODO
4090 delete mode 100644 drivers/staging/telephony/ixj-ver.h
4091 delete mode 100644 drivers/staging/telephony/ixj.c
4092 delete mode 100644 drivers/staging/telephony/ixj.h
4093 delete mode 100644 drivers/staging/telephony/ixj_pcmcia.c
4094 delete mode 100644 drivers/staging/telephony/phonedev.c
4095 create mode 100644 include/linux/platform_data/ad5449.h
4096 Merging char-misc/char-misc-next (dbfd5cc w1/ds2482: use module_i2c_driver to simplify the code)
4097 $ git merge char-misc/char-misc-next
4098 Auto-merging drivers/hv/channel.c
4099 Merge made by the 'recursive' strategy.
4100 Documentation/DocBook/uio-howto.tmpl | 56 ++++
4101 arch/arm/include/asm/io.h | 2 +-
4102 arch/arm/mm/mmap.c | 2 +-
4103 arch/ia64/include/asm/io.h | 2 +-
4104 arch/ia64/kernel/efi.c | 2 +-
4105 arch/sh/include/asm/io.h | 2 +-
4106 arch/sh/mm/mmap.c | 2 +-
4107 drivers/char/mem.c | 10 +-
4108 drivers/char/pc8736x_gpio.c | 3 +-
4109 drivers/hv/channel.c | 8 -
4110 drivers/hv/channel_mgmt.c | 8 -
4111 drivers/misc/mei/init.c | 37 +--
4112 drivers/misc/mei/interrupt.c | 189 ++++++-------
4113 drivers/misc/mei/iorw.c | 197 +++++++++-----
4114 drivers/misc/mei/main.c | 186 +++++--------
4115 drivers/misc/mei/mei_dev.h | 43 +--
4116 drivers/misc/ti-st/st_core.c | 1 -
4117 drivers/uio/Kconfig | 16 ++
4118 drivers/uio/Makefile | 1 +
4119 drivers/uio/uio_dmem_genirq.c | 354 +++++++++++++++++++++++++
4120 drivers/w1/masters/Kconfig | 2 +-
4121 drivers/w1/masters/ds2482.c | 13 +-
4122 include/linux/platform_data/uio_dmem_genirq.h | 26 ++
4123 23 files changed, 785 insertions(+), 377 deletions(-)
4124 create mode 100644 drivers/uio/uio_dmem_genirq.c
4125 create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
4126 Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
4127 $ git merge tmem/linux-next
4128 Auto-merging include/xen/xen.h
4129 Auto-merging include/xen/interface/xen.h
4130 Auto-merging arch/x86/xen/smp.c
4131 Auto-merging arch/x86/xen/setup.c
4132 Auto-merging arch/x86/include/asm/xen/page.h
4133 Auto-merging arch/x86/include/asm/xen/interface.h
4134 Merge made by the 'recursive' strategy.
4135 arch/x86/include/asm/xen/interface.h | 3 ++-
4136 arch/x86/include/asm/xen/page.h | 3 +++
4137 arch/x86/xen/setup.c | 13 +++++++++---
4138 arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
4139 drivers/xen/cpu_hotplug.c | 3 ++-
4140 include/xen/interface/xen.h | 1 +
4141 include/xen/xen.h | 4 ++++
4142 7 files changed, 43 insertions(+), 23 deletions(-)
4143 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
4144 $ git merge writeback/writeback-for-next
4146 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
4147 $ git merge arm-dt/devicetree/arm-next
4149 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
4150 $ git merge hwspinlock/linux-next
4152 Merging pinctrl/for-next (07bc03b Merge branch 'nomadik' into for-next)
4153 $ git merge pinctrl/for-next
4154 Auto-merging include/linux/platform_data/pinctrl-nomadik.h
4155 Auto-merging drivers/pinctrl/mvebu/pinctrl-mvebu.c
4156 Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
4157 Auto-merging arch/arm/mach-u300/core.c
4158 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
4159 Auto-merging MAINTAINERS
4160 Merge made by the 'recursive' strategy.
4161 .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +
4162 .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++
4163 .../bindings/pinctrl/samsung-pinctrl.txt | 118 +-
4164 Documentation/pinctrl.txt | 4 +-
4166 arch/arm/Kconfig | 2 +
4167 arch/arm/boot/dts/Makefile | 44 +-
4168 arch/arm/boot/dts/at91sam9260.dtsi | 187 ++-
4169 arch/arm/boot/dts/at91sam9263.dtsi | 173 ++-
4170 arch/arm/boot/dts/at91sam9263ek.dts | 1 +
4171 arch/arm/boot/dts/at91sam9g15.dtsi | 28 +
4172 arch/arm/boot/dts/at91sam9g15ek.dts | 16 +
4173 arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 +
4174 arch/arm/boot/dts/at91sam9g25.dtsi | 28 +
4175 arch/arm/boot/dts/at91sam9g25ek.dts | 49 +-
4176 arch/arm/boot/dts/at91sam9g35.dtsi | 28 +
4177 arch/arm/boot/dts/at91sam9g35ek.dts | 16 +
4178 arch/arm/boot/dts/at91sam9g45.dtsi | 189 ++-
4179 arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 +
4180 arch/arm/boot/dts/at91sam9n12.dtsi | 180 ++-
4181 arch/arm/boot/dts/at91sam9x25.dtsi | 28 +
4182 arch/arm/boot/dts/at91sam9x25ek.dts | 16 +
4183 arch/arm/boot/dts/at91sam9x35.dtsi | 28 +
4184 arch/arm/boot/dts/at91sam9x35ek.dts | 16 +
4185 arch/arm/boot/dts/at91sam9x5.dtsi | 178 ++-
4186 arch/arm/boot/dts/at91sam9x5ek.dtsi | 59 +
4187 arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 278 ++++
4188 arch/arm/boot/dts/exynos4210.dtsi | 241 +---
4189 arch/arm/configs/at91_dt_defconfig | 1 +
4190 arch/arm/mach-at91/at91rm9200.c | 4 +-
4191 arch/arm/mach-at91/at91sam9260.c | 7 +-
4192 arch/arm/mach-at91/at91sam9261.c | 4 +-
4193 arch/arm/mach-at91/at91sam9263.c | 9 +-
4194 arch/arm/mach-at91/at91sam9g45.c | 10 +-
4195 arch/arm/mach-at91/at91sam9n12.c | 15 +-
4196 arch/arm/mach-at91/at91sam9rl.c | 4 +-
4197 arch/arm/mach-at91/at91sam9x5.c | 19 +-
4198 arch/arm/mach-at91/board-dt.c | 2 -
4199 arch/arm/mach-at91/gpio.c | 190 +--
4200 arch/arm/mach-at91/setup.c | 6 +-
4201 arch/arm/mach-at91/soc.h | 12 +-
4202 arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
4203 arch/arm/mach-nomadik/cpu-8815.c | 2 +-
4204 arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +-
4205 arch/arm/mach-u300/core.c | 3 +-
4206 arch/arm/mach-u300/include/mach/irqs.h | 126 +-
4207 arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
4208 arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
4209 arch/arm/mach-ux500/board-mop500.c | 2 +-
4210 arch/arm/mach-ux500/cpu-db8500.c | 4 +-
4211 arch/arm/mach-ux500/devices-common.c | 3 +-
4212 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 102 --
4213 drivers/mtd/nand/atmel_nand.c | 9 +
4214 drivers/pinctrl/Kconfig | 31 +-
4215 drivers/pinctrl/Makefile | 7 +-
4216 drivers/pinctrl/core.c | 2 +
4217 drivers/pinctrl/core.h | 2 +
4218 drivers/pinctrl/mvebu/Kconfig | 24 +
4219 drivers/pinctrl/mvebu/Makefile | 5 +
4220 drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c | 0
4221 drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c | 0
4222 drivers/pinctrl/{ => mvebu}/pinctrl-dove.c | 0
4223 drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c | 0
4224 drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c | 1 -
4225 drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h | 0
4226 drivers/pinctrl/pinctrl-at91.c | 1508 ++++++++++++++++++++
4227 drivers/pinctrl/pinctrl-coh901.c | 122 +-
4228 drivers/pinctrl/pinctrl-exynos.c | 367 +++--
4229 drivers/pinctrl/pinctrl-exynos.h | 170 +--
4230 drivers/pinctrl/pinctrl-nomadik-db8500.c | 104 +-
4231 drivers/pinctrl/pinctrl-nomadik.c | 57 +-
4232 drivers/pinctrl/pinctrl-nomadik.h | 2 +-
4233 drivers/pinctrl/pinctrl-samsung.c | 203 ++-
4234 drivers/pinctrl/pinctrl-samsung.h | 29 +-
4235 drivers/pinctrl/pinctrl-u300.c | 32 +-
4236 drivers/pinctrl/pinmux.c | 67 +-
4237 drivers/tty/serial/atmel_serial.c | 8 +
4238 include/linux/platform_data/pinctrl-coh901.h | 2 -
4239 .../linux/platform_data/pinctrl-nomadik.h | 111 +-
4240 79 files changed, 3976 insertions(+), 1485 deletions(-)
4241 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
4242 create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
4243 create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
4244 create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
4245 create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
4246 create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
4247 create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
4248 create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
4249 create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
4250 create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
4251 create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
4252 delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
4253 create mode 100644 drivers/pinctrl/mvebu/Kconfig
4254 create mode 100644 drivers/pinctrl/mvebu/Makefile
4255 rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%)
4256 rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%)
4257 rename drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%)
4258 rename drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%)
4259 rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (99%)
4260 rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%)
4261 create mode 100644 drivers/pinctrl/pinctrl-at91.c
4262 rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
4263 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
4264 $ git merge vhost/linux-next
4265 Resolved 'drivers/net/tun.c' using previous resolution.
4266 Auto-merging drivers/net/tun.c
4267 CONFLICT (content): Merge conflict in drivers/net/tun.c
4268 Automatic merge failed; fix conflicts and then commit the result.
4270 [master e672b1f] Merge remote-tracking branch 'vhost/linux-next'
4271 $ git diff -M --stat --summary HEAD^..
4272 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
4273 $ git merge memblock/memblock-kill-early_node_map
4275 Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
4276 $ git merge remoteproc/for-next
4278 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
4279 $ git merge irqdomain/irqdomain/next
4281 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
4282 $ git merge gpio/gpio/next
4284 Merging gpio-lw/for-next (3121424 Merge branch 'devel' into for-next)
4285 $ git merge gpio-lw/for-next
4286 Auto-merging drivers/gpio/gpio-mvebu.c
4287 Auto-merging arch/arm/Kconfig
4288 Merge made by the 'recursive' strategy.
4289 arch/arm/Kconfig | 1 +
4290 drivers/gpio/Kconfig | 15 +++
4291 drivers/gpio/Makefile | 2 +
4292 drivers/gpio/gpio-74x164.c | 2 +-
4293 drivers/gpio/gpio-clps711x.c | 199 +++++++++++++++++++++++++++++++++++++++
4294 drivers/gpio/gpio-da9055.c | 204 ++++++++++++++++++++++++++++++++++++++++
4295 drivers/gpio/gpio-em.c | 46 ++-------
4296 drivers/gpio/gpio-mvebu.c | 8 +-
4297 drivers/gpio/gpio-omap.c | 37 +++++++-
4298 drivers/gpio/gpio-pl061.c | 59 +++++-------
4299 drivers/gpio/gpio-tc3589x.c | 20 ++--
4300 drivers/gpio/gpio-tegra.c | 14 +--
4301 drivers/gpio/gpio-timberdale.c | 4 +-
4302 drivers/gpio/gpio-vt8500.c | 2 +
4303 drivers/gpio/gpiolib.c | 134 +++++++++++++++++---------
4304 include/asm-generic/gpio.h | 5 +-
4305 16 files changed, 605 insertions(+), 147 deletions(-)
4306 create mode 100644 drivers/gpio/gpio-clps711x.c
4307 create mode 100644 drivers/gpio/gpio-da9055.c
4308 Merging arm-soc/for-next (be792b9 Merge branch 'next/smp' into for-next)
4309 $ git merge arm-soc/for-next
4310 Auto-merging include/video/omapvrfb.h
4311 Auto-merging include/linux/platform_data/mmc-omap.h
4312 Auto-merging include/linux/platform_data/leds-omap.h
4313 Auto-merging include/linux/dma/ipu-dma.h
4314 Auto-merging drivers/usb/host/ohci-omap.c
4315 Auto-merging drivers/staging/tidspbridge/include/dspbridge/host_os.h
4316 Auto-merging drivers/hwmon/Makefile
4317 Auto-merging drivers/hwmon/Kconfig
4318 Auto-merging drivers/dma/imx-dma.c
4319 Removing arch/arm/plat-omap/include/plat/sram.h
4320 Removing arch/arm/plat-omap/include/plat/sdrc.h
4321 Removing arch/arm/plat-omap/include/plat/omap-secure.h
4322 Removing arch/arm/plat-omap/include/plat/multi.h
4323 Removing arch/arm/plat-omap/include/plat/fpga.h
4324 Removing arch/arm/plat-omap/include/plat/dma-44xx.h
4325 Removing arch/arm/plat-omap/include/plat/clock.h
4326 Removing arch/arm/plat-omap/include/plat/clkdev_omap.h
4327 Auto-merging arch/arm/plat-omap/include/plat-omap/dma-omap.h
4328 Auto-merging arch/arm/plat-omap/common.h
4329 Removing arch/arm/plat-omap/clock.c
4330 Removing arch/arm/plat-mxc/include/mach/uncompress.h
4331 Removing arch/arm/plat-mxc/include/mach/timex.h
4332 Removing arch/arm/plat-mxc/include/mach/irqs.h
4333 Removing arch/arm/plat-mxc/Makefile
4334 Removing arch/arm/plat-mxc/Kconfig
4335 Removing arch/arm/mach-vt8500/include/mach/restart.h
4336 Removing arch/arm/mach-vt8500/include/mach/i8042.h
4337 Removing arch/arm/mach-vt8500/include/mach/hardware.h
4338 Removing arch/arm/mach-vt8500/include/mach/entry-macro.S
4339 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
4340 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
4341 Auto-merging arch/arm/mach-ux500/board-mop500.c
4342 Auto-merging arch/arm/mach-socfpga/core.h
4343 Auto-merging arch/arm/mach-omap2/omap_hwmod.h
4344 Auto-merging arch/arm/mach-omap2/omap_device.h
4345 Auto-merging arch/arm/mach-omap2/omap_device.c
4346 Auto-merging arch/arm/mach-omap2/i2c.h
4347 Auto-merging arch/arm/mach-omap2/gpmc.h
4348 Auto-merging arch/arm/mach-imx/ulpi.c
4349 Auto-merging arch/arm/mach-imx/tzic.c
4350 Auto-merging arch/arm/mach-imx/time.c
4351 Auto-merging arch/arm/mach-imx/system.c
4352 Auto-merging arch/arm/mach-imx/irq-common.h
4353 Auto-merging arch/arm/mach-imx/iram_alloc.c
4354 Auto-merging arch/arm/mach-imx/iomux-v3.c
4355 Auto-merging arch/arm/mach-imx/iomux-v1.c
4356 Auto-merging arch/arm/mach-imx/iomux-mx51.h
4357 Auto-merging arch/arm/mach-imx/iomux-mx50.h
4358 Auto-merging arch/arm/mach-imx/iomux-mx35.h
4359 Auto-merging arch/arm/mach-imx/iomux-mx27.h
4360 Auto-merging arch/arm/mach-imx/iomux-mx25.h
4361 Auto-merging arch/arm/mach-imx/iomux-mx21.h
4362 Auto-merging arch/arm/mach-imx/iomux-mx1.h
4363 Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
4364 Auto-merging arch/arm/mach-imx/hardware.h
4365 Auto-merging arch/arm/mach-imx/epit.c
4366 Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
4367 Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
4368 Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
4369 Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
4370 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
4371 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
4372 Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
4373 Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
4374 Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
4375 Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
4376 Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
4377 Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
4378 Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
4379 Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
4380 Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
4381 Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
4382 Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
4383 Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
4384 Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
4385 Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
4386 Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
4387 Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
4388 Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
4389 Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
4390 Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
4391 Auto-merging arch/arm/mach-imx/devices/platfoResolved 'arch/arm/Kconfig' using previous resolution.
4392 Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
4394 Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
4395 Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
4396 Auto-merging arch/arm/mach-imx/devices/platform-fec.c
4397 Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
4398 Auto-merging arch/arm/mach-imx/devices/devices.c
4399 Auto-merging arch/arm/mach-imx/devices/devices-common.h
4400 Auto-merging arch/arm/mach-imx/devices/Makefile
4401 Auto-merging arch/arm/mach-imx/cpufreq.c
4402 Auto-merging arch/arm/mach-imx/cpu.c
4403 Auto-merging arch/arm/mach-imx/common.h
4404 Auto-merging arch/arm/mach-imx/clk-imx25.c
4405 Auto-merging arch/arm/mach-imx/avic.c
4406 Auto-merging arch/arm/mach-imx/3ds_debugboard.c
4407 Auto-merging arch/arm/mach-clps711x/edb7211.c
4408 Removing arch/arm/mach-clps711x/edb7211-mm.c
4409 Auto-merging arch/arm/include/debug/imx.S
4410 Removing arch/arm/configs/fortunet_defconfig
4411 Removing arch/arm/configs/edb7211_defconfig
4412 Removing arch/arm/boot/compressed/head-vt8500.S
4413 Auto-merging arch/arm/Makefile
4414 Auto-merging arch/arm/Kconfig
4415 CONFLICT (content): Merge conflict in arch/arm/Kconfig
4416 Auto-merging MAINTAINERS
4417 Automatic merge failed; fix conflicts and then commit the result.
4419 [master 1b0828a] Merge remote-tracking branch 'arm-soc/for-next'
4420 $ git diff -M --stat --summary HEAD^..
4421 .../bindings/arm/altera/socfpga-reset.txt | 11 +
4422 .../bindings/arm/altera/socfpga-system.txt | 11 +
4423 .../devicetree/bindings/arm/vexpress-sysreg.txt | 50 ++
4424 Documentation/devicetree/bindings/arm/vexpress.txt | 98 +++-
4425 .../devicetree/bindings/hwmon/vexpress.txt | 23 +
4426 .../devicetree/bindings/i2c/fsl-imx-i2c.txt | 4 +-
4427 Documentation/hwmon/vexpress | 34 ++
4429 arch/arm/Kconfig | 23 +-
4430 arch/arm/Kconfig.debug | 8 +
4431 arch/arm/Makefile | 1 -
4432 arch/arm/arm-soc-for-next-contents.txt | 27 +
4433 arch/arm/boot/compressed/Makefile | 4 -
4434 arch/arm/boot/compressed/head-vt8500.S | 46 --
4435 arch/arm/boot/dts/imx27.dtsi | 4 +-
4436 arch/arm/boot/dts/imx51.dtsi | 4 +-
4437 arch/arm/boot/dts/imx53.dtsi | 6 +-
4438 arch/arm/boot/dts/imx6q.dtsi | 6 +-
4439 arch/arm/boot/dts/socfpga.dtsi | 10 +
4440 arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 146 +++++-
4441 arch/arm/boot/dts/vexpress-v2m.dtsi | 146 +++++-
4442 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 121 ++++-
4443 arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 186 ++++++-
4444 arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 84 ++-
4445 arch/arm/boot/dts/vexpress-v2p-ca9.dts | 136 ++++-
4446 arch/arm/configs/clps711x_defconfig | 78 +++
4447 arch/arm/configs/edb7211_defconfig | 27 -
4448 arch/arm/configs/fortunet_defconfig | 28 -
4449 arch/arm/configs/imx_v4_v5_defconfig | 4 +-
4450 arch/arm/configs/imx_v6_v7_defconfig | 2 +
4451 arch/arm/configs/socfpga_defconfig | 5 +-
4452 arch/arm/include/asm/hardware/sp810.h | 6 -
4453 .../mach/debug-macro.S => include/debug/imx.S} | 33 +-
4454 arch/arm/include/debug/vexpress.S | 10 +-
4455 arch/arm/mach-clps711x/Makefile | 2 +-
4456 arch/arm/mach-clps711x/autcpu12.c | 15 +-
4457 arch/arm/mach-clps711x/cdb89712.c | 4 +-
4458 arch/arm/mach-clps711x/common.c | 113 ++--
4459 arch/arm/mach-clps711x/edb7211-mm.c | 82 ---
4460 .../mach-clps711x/{edb7211-arch.c => edb7211.c} | 58 +-
4461 arch/arm/mach-clps711x/include/mach/autcpu12.h | 14 +-
4462 arch/arm/mach-clps711x/include/mach/clps711x.h | 3 +
4463 arch/arm/mach-clps711x/include/mach/hardware.h | 56 +-
4464 arch/arm/mach-clps711x/include/mach/irqs.h | 4 -
4465 arch/arm/mach-clps711x/include/mach/syspld.h | 9 +-
4466 arch/arm/mach-clps711x/p720t.c | 18 +-
4467 arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c | 2 +-
4468 .../include/mach => mach-imx}/3ds_debugboard.h | 0
4469 arch/arm/mach-imx/Kconfig | 90 +++-
4470 arch/arm/mach-imx/Makefile | 22 +
4471 arch/arm/{plat-mxc => mach-imx}/avic.c | 5 +-
4472 .../include/mach => mach-imx}/board-mx31lilly.h | 0
4473 .../include/mach => mach-imx}/board-mx31lite.h | 0
4474 .../include/mach => mach-imx}/board-mx31moboard.h | 0
4475 .../include/mach => mach-imx}/board-pcm038.h | 0
4476 arch/arm/mach-imx/clk-imx1.c | 17 +-
4477 arch/arm/mach-imx/clk-imx21.c | 18 +-
4478 arch/arm/mach-imx/clk-imx25.c | 26 +-
4479 arch/arm/mach-imx/clk-imx27.c | 40 +-
4480 arch/arm/mach-imx/clk-imx31.c | 21 +-
4481 arch/arm/mach-imx/clk-imx35.c | 13 +-
4482 arch/arm/mach-imx/clk-imx51-imx53.c | 15 +-
4483 arch/arm/mach-imx/clk-imx6q.c | 3 +-
4484 arch/arm/mach-imx/clk-pllv1.c | 4 +-
4485 .../{plat-mxc/include/mach => mach-imx}/common.h | 1 +
4486 arch/arm/mach-imx/cpu-imx25.c | 5 +-
4487 arch/arm/mach-imx/cpu-imx27.c | 2 +-
4488 arch/arm/mach-imx/cpu-imx31.c | 7 +-
4489 arch/arm/mach-imx/cpu-imx35.c | 5 +-
4490 arch/arm/mach-imx/cpu-imx5.c | 3 +-
4491 arch/arm/{plat-mxc => mach-imx}/cpu.c | 3 +-
4492 arch/arm/mach-imx/cpu_op-mx51.c | 3 +-
4493 arch/arm/{plat-mxc => mach-imx}/cpufreq.c | 3 +-
4494 arch/arm/{plat-mxc => mach-imx}/cpuidle.c | 0
4495 .../{plat-mxc/include/mach => mach-imx}/cpuidle.h | 0
4496 arch/arm/mach-imx/devices-imx1.h | 3 +-
4497 arch/arm/mach-imx/devices-imx21.h | 3 +-
4498 arch/arm/mach-imx/devices-imx25.h | 3 +-
4499 arch/arm/mach-imx/devices-imx27.h | 3 +-
4500 arch/arm/mach-imx/devices-imx31.h | 3 +-
4501 arch/arm/mach-imx/devices-imx35.h | 3 +-
4502 arch/arm/mach-imx/devices-imx50.h | 3 +-
4503 arch/arm/mach-imx/devices-imx51.h | 3 +-
4504 arch/arm/{plat-mxc => mach-imx}/devices/Kconfig | 0
4505 arch/arm/{plat-mxc => mach-imx}/devices/Makefile | 2 +
4506 .../mach => mach-imx/devices}/devices-common.h | 9 +-
4507 arch/arm/{plat-mxc => mach-imx/devices}/devices.c | 4 +-
4508 .../devices/platform-ahci-imx.c | 5 +-
4509 .../{plat-mxc => mach-imx}/devices/platform-fec.c | 5 +-
4510 .../devices/platform-flexcan.c | 4 +-
4511 .../devices/platform-fsl-usb2-udc.c | 5 +-
4512 .../devices/platform-gpio-mxc.c | 2 +-
4513 .../devices/platform-gpio_keys.c | 5 +-
4514 .../devices/platform-imx-dma.c | 23 +-
4515 .../devices/platform-imx-fb.c | 16 +-
4516 .../devices/platform-imx-i2c.c | 32 +-
4517 .../devices/platform-imx-keypad.c | 4 +-
4518 .../devices/platform-imx-ssi.c | 4 +-
4519 .../devices/platform-imx-uart.c | 4 +-
4520 .../devices/platform-imx2-wdt.c | 5 +-
4521 .../devices/platform-imx21-hcd.c | 4 +-
4522 .../devices/platform-imx27-coda.c | 4 +-
4523 .../devices/platform-imx_udc.c | 4 +-
4524 .../devices/platform-imxdi_rtc.c | 5 +-
4525 .../devices/platform-ipu-core.c | 5 +-
4526 .../devices/platform-mx1-camera.c | 4 +-
4527 .../devices/platform-mx2-camera.c | 16 +-
4528 .../devices/platform-mxc-ehci.c | 5 +-
4529 .../devices/platform-mxc-mmc.c | 20 +-
4530 .../devices/platform-mxc_nand.c | 25 +-
4531 .../devices/platform-mxc_pwm.c | 4 +-
4532 .../devices/platform-mxc_rnga.c | 4 +-
4533 .../devices/platform-mxc_rtc.c | 13 +-
4534 .../devices/platform-mxc_w1.c | 4 +-
4535 .../devices/platform-pata_imx.c | 4 +-
4536 .../devices/platform-sdhci-esdhc-imx.c | 5 +-
4537 .../devices/platform-spi_imx.c | 4 +-
4538 arch/arm/mach-imx/ehci-imx25.c | 4 +-
4539 arch/arm/mach-imx/ehci-imx27.c | 4 +-
4540 arch/arm/mach-imx/ehci-imx31.c | 4 +-
4541 arch/arm/mach-imx/ehci-imx35.c | 4 +-
4542 arch/arm/mach-imx/ehci-imx5.c | 4 +-
4543 arch/arm/{plat-mxc => mach-imx}/epit.c | 6 +-
4544 .../include/mach => mach-imx}/eukrea-baseboards.h | 0
4545 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 7 +-
4546 arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 8 +-
4547 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 7 +-
4548 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 7 +-
4549 .../{plat-mxc/include/mach => mach-imx}/hardware.h | 26 +-
4550 arch/arm/mach-imx/hotplug.c | 3 +-
4551 arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h | 0
4552 arch/arm/mach-imx/imx27-dt.c | 11 +-
4553 arch/arm/mach-imx/imx31-dt.c | 5 +-
4554 arch/arm/mach-imx/imx51-dt.c | 9 +-
4555 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h | 10 -
4556 arch/arm/mach-imx/iomux-imx31.c | 5 +-
4557 .../include/mach => mach-imx}/iomux-mx1.h | 2 +-
4558 .../include/mach => mach-imx}/iomux-mx21.h | 4 +-
4559 .../include/mach => mach-imx}/iomux-mx25.h | 2 +-
4560 .../include/mach => mach-imx}/iomux-mx27.h | 4 +-
4561 .../include/mach => mach-imx}/iomux-mx2x.h | 0
4562 .../include/mach => mach-imx}/iomux-mx3.h | 0
4563 .../include/mach => mach-imx}/iomux-mx35.h | 2 +-
4564 .../include/mach => mach-imx}/iomux-mx50.h | 2 +-
4565 .../include/mach => mach-imx}/iomux-mx51.h | 2 +-
4566 arch/arm/{plat-mxc => mach-imx}/iomux-v1.c | 5 +-
4567 .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h | 0
4568 arch/arm/{plat-mxc => mach-imx}/iomux-v3.c | 5 +-
4569 .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h | 0
4570 .../arm/{plat-mxc/include/mach => mach-imx}/iram.h | 0
4571 arch/arm/{plat-mxc => mach-imx}/iram_alloc.c | 3 +-
4572 arch/arm/{plat-mxc => mach-imx}/irq-common.c | 0
4573 arch/arm/{plat-mxc => mach-imx}/irq-common.h | 3 +
4574 arch/arm/mach-imx/lluart.c | 3 +-
4575 arch/arm/mach-imx/mach-apf9328.c | 7 +-
4576 arch/arm/mach-imx/mach-armadillo5x0.c | 9 +-
4577 arch/arm/mach-imx/mach-bug.c | 7 +-
4578 arch/arm/mach-imx/mach-cpuimx27.c | 11 +-
4579 arch/arm/mach-imx/mach-cpuimx35.c | 9 +-
4580 arch/arm/mach-imx/mach-cpuimx51sd.c | 9 +-
4581 arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 10 +-
4582 arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
4583 arch/arm/mach-imx/mach-imx27ipcam.c | 6 +-
4584 arch/arm/mach-imx/mach-imx27lite.c | 6 +-
4585 arch/arm/mach-imx/mach-imx53.c | 11 +-
4586 arch/arm/mach-imx/mach-imx6q.c | 6 +-
4587 arch/arm/mach-imx/mach-kzm_arm11_01.c | 7 +-
4588 arch/arm/mach-imx/mach-mx1ads.c | 7 +-
4589 arch/arm/mach-imx/mach-mx21ads.c | 6 +-
4590 arch/arm/mach-imx/mach-mx25_3ds.c | 8 +-
4591 arch/arm/mach-imx/mach-mx27_3ds.c | 10 +-
4592 arch/arm/mach-imx/mach-mx27ads.c | 6 +-
4593 arch/arm/mach-imx/mach-mx31_3ds.c | 12 +-
4594 arch/arm/mach-imx/mach-mx31ads.c | 5 +-
4595 arch/arm/mach-imx/mach-mx31lilly.c | 11 +-
4596 arch/arm/mach-imx/mach-mx31lite.c | 11 +-
4597 arch/arm/mach-imx/mach-mx31moboard.c | 14 +-
4598 arch/arm/mach-imx/mach-mx35_3ds.c | 8 +-
4599 arch/arm/mach-imx/mach-mx50_rdp.c | 7 +-
4600 arch/arm/mach-imx/mach-mx51_3ds.c | 9 +-
4601 arch/arm/mach-imx/mach-mx51_babbage.c | 7 +-
4602 arch/arm/mach-imx/mach-mxt_td60.c | 6 +-
4603 arch/arm/mach-imx/mach-pca100.c | 8 +-
4604 arch/arm/mach-imx/mach-pcm037.c | 8 +-
4605 arch/arm/mach-imx/mach-pcm037_eet.c | 5 +-
4606 arch/arm/mach-imx/mach-pcm038.c | 13 +-
4607 arch/arm/mach-imx/mach-pcm043.c | 9 +-
4608 arch/arm/mach-imx/mach-qong.c | 6 +-
4609 arch/arm/mach-imx/mach-scb9328.c | 7 +-
4610 arch/arm/mach-imx/mach-vpr200.c | 7 +-
4611 arch/arm/mach-imx/mm-imx1.c | 9 +-
4612 arch/arm/mach-imx/mm-imx21.c | 14 +-
4613 arch/arm/mach-imx/mm-imx25.c | 12 +-
4614 arch/arm/mach-imx/mm-imx27.c | 14 +-
4615 arch/arm/mach-imx/mm-imx3.c | 13 +-
4616 arch/arm/mach-imx/mm-imx5.c | 12 +-
4617 arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h | 0
4618 .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h | 0
4619 .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h | 0
4620 .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h | 0
4621 .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h | 0
4622 .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h | 0
4623 arch/arm/mach-imx/mx31lilly-db.c | 9 +-
4624 arch/arm/mach-imx/mx31lite-db.c | 9 +-
4625 arch/arm/mach-imx/mx31moboard-devboard.c | 9 +-
4626 arch/arm/mach-imx/mx31moboard-marxbot.c | 9 +-
4627 arch/arm/mach-imx/mx31moboard-smartbot.c | 11 +-
4628 .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h | 0
4629 .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h | 0
4630 .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h | 0
4631 .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h | 0
4632 .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h | 0
4633 .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h | 0
4634 arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h | 0
4635 arch/arm/mach-imx/pcm970-baseboard.c | 7 +-
4636 arch/arm/mach-imx/platsmp.c | 5 +-
4637 arch/arm/mach-imx/pm-imx27.c | 3 +-
4638 arch/arm/mach-imx/pm-imx3.c | 7 +-
4639 arch/arm/mach-imx/pm-imx5.c | 7 +-
4640 arch/arm/mach-imx/pm-imx6q.c | 5 +-
4641 arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c | 0
4642 arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S | 0
4643 arch/arm/{plat-mxc => mach-imx}/system.c | 5 +-
4644 arch/arm/{plat-mxc => mach-imx}/time.c | 5 +-
4645 arch/arm/{plat-mxc => mach-imx}/tzic.c | 6 +-
4646 arch/arm/{plat-mxc => mach-imx}/ulpi.c | 2 +-
4647 .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h | 0
4648 arch/arm/mach-omap1/board-ams-delta.c | 1 -
4649 arch/arm/mach-omap1/board-fsample.c | 9 +-
4650 arch/arm/mach-omap1/board-generic.c | 1 -
4651 arch/arm/mach-omap1/board-h2-mmc.c | 5 +-
4652 arch/arm/mach-omap1/board-h2.c | 6 +-
4653 arch/arm/mach-omap1/board-h3-mmc.c | 3 +-
4654 arch/arm/mach-omap1/board-h3.c | 5 +-
4655 arch/arm/mach-omap1/board-htcherald.c | 3 +-
4656 arch/arm/mach-omap1/board-innovator.c | 31 +-
4657 arch/arm/mach-omap1/board-nokia770.c | 5 +-
4658 arch/arm/mach-omap1/board-osk.c | 3 +-
4659 arch/arm/mach-omap1/board-palmte.c | 6 +-
4660 arch/arm/mach-omap1/board-palmtt.c | 8 +-
4661 arch/arm/mach-omap1/board-palmz71.c | 6 +-
4662 arch/arm/mach-omap1/board-perseus2.c | 9 +-
4663 arch/arm/mach-omap1/board-sx1-mmc.c | 3 +-
4664 arch/arm/mach-omap1/board-sx1.c | 6 +-
4665 arch/arm/mach-omap1/board-voiceblue.c | 3 +-
4666 arch/arm/mach-omap1/clock.c | 506 +++++++++++++++++-
4667 arch/arm/mach-omap1/clock.h | 178 ++++++-
4668 arch/arm/mach-omap1/clock_data.c | 17 +-
4669 arch/arm/mach-omap1/common.h | 6 +-
4670 arch/arm/mach-omap1/devices.c | 15 +-
4671 arch/arm/mach-omap1/dma.c | 6 +-
4672 arch/arm/mach-omap1/dma.h | 83 +++
4673 arch/arm/mach-omap1/flash.c | 2 +-
4674 arch/arm/mach-omap1/fpga.c | 2 +-
4675 arch/arm/mach-omap1/i2c.c | 61 ++-
4676 arch/arm/mach-omap1/id.c | 2 +-
4677 arch/arm/mach-omap1/include/mach/hardware.h | 4 +-
4678 arch/arm/mach-omap1/include/mach/memory.h | 2 +-
4679 arch/arm/mach-omap1/include/mach/omap1510.h | 113 ++++
4680 .../include/plat => mach-omap1/include/mach}/tc.h | 0
4681 arch/arm/mach-omap1/io.c | 4 +-
4682 arch/arm/mach-omap1/irq.c | 2 +-
4683 arch/arm/mach-omap1/lcd_dma.c | 4 +-
4684 arch/arm/mach-omap1/mcbsp.c | 5 +-
4685 arch/arm/mach-omap1/mmc.h | 18 +
4686 arch/arm/mach-omap1/opp_data.c | 2 +-
4687 arch/arm/mach-omap1/pm.c | 10 +-
4688 arch/arm/mach-omap1/pm_bus.c | 3 -
4689 arch/arm/mach-omap1/serial.c | 1 -
4690 arch/arm/mach-omap1/soc.h | 229 ++++++++
4691 arch/arm/mach-omap2/Makefile | 3 +-
4692 arch/arm/mach-omap2/am35xx-emac.c | 2 +-
4693 arch/arm/mach-omap2/board-2430sdp.c | 2 +-
4694 arch/arm/mach-omap2/board-3430sdp.c | 5 +-
4695 arch/arm/mach-omap2/board-3630sdp.c | 2 +-
4696 arch/arm/mach-omap2/board-4430sdp.c | 2 +-
4697 arch/arm/mach-omap2/board-apollon.c | 4 +-
4698 arch/arm/mach-omap2/board-cm-t35.c | 5 +-
4699 arch/arm/mach-omap2/board-cm-t3517.c | 5 +-
4700 arch/arm/mach-omap2/board-devkit8000.c | 10 +-
4701 arch/arm/mach-omap2/board-flash.c | 52 +-
4702 arch/arm/mach-omap2/board-flash.h | 8 +-
4703 arch/arm/mach-omap2/board-h4.c | 4 +-
4704 arch/arm/mach-omap2/board-igep0020.c | 5 +-
4705 arch/arm/mach-omap2/board-ldp.c | 8 +-
4706 arch/arm/mach-omap2/board-n8x0.c | 3 +-
4707 arch/arm/mach-omap2/board-omap3beagle.c | 13 +-
4708 arch/arm/mach-omap2/board-omap3evm.c | 9 +-
4709 arch/arm/mach-omap2/board-omap3logic.c | 5 +-
4710 arch/arm/mach-omap2/board-omap3pandora.c | 3 +-
4711 arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
4712 arch/arm/mach-omap2/board-omap3touchbook.c | 10 +-
4713 arch/arm/mach-omap2/board-omap4panda.c | 2 +-
4714 arch/arm/mach-omap2/board-overo.c | 9 +-
4715 arch/arm/mach-omap2/board-rm680.c | 6 +-
4716 arch/arm/mach-omap2/board-rx51-peripherals.c | 7 +-
4717 arch/arm/mach-omap2/board-rx51.c | 6 +-
4718 arch/arm/mach-omap2/board-zoom-debugboard.c | 4 +-
4719 arch/arm/mach-omap2/board-zoom-display.c | 3 +-
4720 arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +-
4721 arch/arm/mach-omap2/board-zoom.c | 7 +-
4722 .../arm/mach-omap2/{include/mach => }/board-zoom.h | 0
4723 arch/arm/mach-omap2/clkt2xxx_apll.c | 1 -
4724 arch/arm/mach-omap2/clkt2xxx_dpll.c | 2 -
4725 arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 5 +-
4726 arch/arm/mach-omap2/clkt2xxx_osc.c | 2 -
4727 arch/arm/mach-omap2/clkt2xxx_sys.c | 2 -
4728 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 5 +-
4729 arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 4 +-
4730 arch/arm/mach-omap2/clkt_clksel.c | 2 -
4731 arch/arm/mach-omap2/clkt_dpll.c | 2 -
4732 arch/arm/mach-omap2/clkt_iclk.c | 1 -
4733 arch/arm/mach-omap2/clock.c | 518 +++++++++++++++++-
4734 arch/arm/mach-omap2/clock.h | 317 ++++++++++-
4735 arch/arm/mach-omap2/clock2420_data.c | 4 -
4736 arch/arm/mach-omap2/clock2430.c | 2 -
4737 arch/arm/mach-omap2/clock2430_data.c | 4 -
4738 arch/arm/mach-omap2/clock2xxx.c | 2 -
4739 arch/arm/mach-omap2/clock33xx_data.c | 5 +-
4740 arch/arm/mach-omap2/clock34xx.c | 2 -
4741 arch/arm/mach-omap2/clock3517.c | 2 -
4742 arch/arm/mach-omap2/clock36xx.c | 2 -
4743 arch/arm/mach-omap2/clock3xxx.c | 2 -
4744 arch/arm/mach-omap2/clock3xxx_data.c | 4 -
4745 arch/arm/mach-omap2/clock44xx_data.c | 4 -
4746 arch/arm/mach-omap2/clockdomain.c | 3 +-
4747 arch/arm/mach-omap2/clockdomain.h | 5 +-
4748 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 2 +
4749 arch/arm/mach-omap2/clockdomains2420_data.c | 1 +
4750 arch/arm/mach-omap2/clockdomains2430_data.c | 1 +
4751 arch/arm/mach-omap2/clockdomains3xxx_data.c | 1 +
4752 arch/arm/mach-omap2/cm33xx.c | 2 +-
4753 arch/arm/mach-omap2/common-board-devices.c | 46 --
4754 arch/arm/mach-omap2/common-board-devices.h | 1 -
4755 arch/arm/mach-omap2/common.c | 22 +-
4756 arch/arm/mach-omap2/common.h | 9 +-
4757 arch/arm/mach-omap2/control.c | 4 +-
4758 arch/arm/mach-omap2/devices.c | 8 +-
4759 arch/arm/mach-omap2/display.c | 45 +-
4760 arch/arm/mach-omap2/dma.c | 8 +-
4761 arch/arm/mach-omap2/dma.h | 131 +++++
4762 arch/arm/mach-omap2/dpll3xxx.c | 2 -
4763 arch/arm/mach-omap2/dpll44xx.c | 2 -
4764 arch/arm/mach-omap2/drm.c | 4 +-
4765 arch/arm/mach-omap2/dsp.c | 2 +-
4766 arch/arm/mach-omap2/gpio.c | 6 +-
4767 arch/arm/mach-omap2/gpmc-nand.c | 85 +--
4768 arch/arm/mach-omap2/gpmc-nand.h | 27 +
4769 arch/arm/mach-omap2/gpmc-onenand.c | 214 ++++----
4770 arch/arm/mach-omap2/gpmc-onenand.h | 24 +
4771 arch/arm/mach-omap2/gpmc-smc91x.c | 2 +-
4772 arch/arm/mach-omap2/gpmc-smsc911x.c | 2 +-
4773 arch/arm/mach-omap2/gpmc.c | 464 +---------------
4774 .../{plat-omap/include/plat => mach-omap2}/gpmc.h | 61 +--
4775 arch/arm/mach-omap2/hdq1w.c | 4 +-
4776 arch/arm/mach-omap2/hdq1w.h | 2 +-
4777 arch/arm/mach-omap2/hsmmc.c | 7 +-
4778 arch/arm/mach-omap2/hwspinlock.c | 4 +-
4779 arch/arm/mach-omap2/i2c.c | 53 +-
4780 .../{plat-omap/include/plat => mach-omap2}/i2c.h | 25 +-
4781 arch/arm/mach-omap2/io.c | 12 +-
4782 arch/arm/mach-omap2/mcbsp.c | 7 +-
4783 arch/arm/mach-omap2/mmc.h | 23 +
4784 arch/arm/mach-omap2/msdi.c | 7 +-
4785 arch/arm/mach-omap2/mux.c | 3 +-
4786 arch/arm/mach-omap2/omap-mpuss-lowpower.c | 1 +
4787 .../include/plat => mach-omap2}/omap-pm.h | 0
4788 arch/arm/mach-omap2/omap-secure.c | 1 -
4789 arch/arm/mach-omap2/omap-secure.h | 7 +
4790 arch/arm/mach-omap2/omap4-common.c | 7 +-
4791 arch/arm/{plat-omap => mach-omap2}/omap_device.c | 5 +-
4792 .../include/plat => mach-omap2}/omap_device.h | 2 +-
4793 arch/arm/mach-omap2/omap_hwmod.c | 4 +-
4794 .../include/plat => mach-omap2}/omap_hwmod.h | 1 -
4795 arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 +-
4796 arch/arm/mach-omap2/omap_hwmod_2430_data.c | 12 +-
4797 .../omap_hwmod_2xxx_3xxx_interconnect_data.c | 3 +-
4798 .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 10 +-
4799 .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 3 +-
4800 arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 5 +-
4801 arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 10 +-
4802 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 +-
4803 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 +-
4804 arch/arm/mach-omap2/omap_hwmod_common_data.c | 2 +-
4805 arch/arm/mach-omap2/omap_hwmod_common_data.h | 2 +-
4806 arch/arm/mach-omap2/omap_opp_data.h | 2 +-
4807 arch/arm/mach-omap2/omap_twl.c | 1 +
4808 arch/arm/mach-omap2/opp.c | 2 +-
4809 arch/arm/mach-omap2/opp3xxx_data.c | 1 +
4810 arch/arm/mach-omap2/pm-debug.c | 5 +-
4811 arch/arm/mach-omap2/pm.c | 5 +-
4812 arch/arm/mach-omap2/pm24xx.c | 8 +-
4813 arch/arm/mach-omap2/pm34xx.c | 9 +-
4814 arch/arm/mach-omap2/pm44xx.c | 1 +
4815 arch/arm/mach-omap2/pmu.c | 5 +-
4816 arch/arm/mach-omap2/powerdomain.h | 2 -
4817 arch/arm/mach-omap2/powerdomains2xxx_data.c | 1 +
4818 arch/arm/mach-omap2/prcm.c | 1 +
4819 arch/arm/mach-omap2/prm33xx.c | 2 +-
4820 arch/arm/mach-omap2/prm_common.c | 2 +-
4821 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 2 +-
4822 arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 2 +-
4823 arch/arm/mach-omap2/sdram-nokia.c | 4 +-
4824 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 2 +-
4825 .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 2 +-
4826 arch/arm/mach-omap2/sdrc.c | 23 +-
4827 arch/arm/mach-omap2/sdrc.h | 146 +++++-
4828 arch/arm/mach-omap2/sdrc2xxx.c | 4 +-
4829 arch/arm/mach-omap2/serial.c | 11 +-
4830 arch/arm/mach-omap2/sleep34xx.S | 2 +-
4831 arch/arm/mach-omap2/soc.h | 468 ++++++++++++++++-
4832 arch/arm/mach-omap2/sr_device.c | 4 +-
4833 arch/arm/mach-omap2/timer.c | 6 +-
4834 arch/arm/mach-omap2/twl-common.c | 1 -
4835 arch/arm/mach-omap2/usb-host.c | 3 +-
4836 arch/arm/mach-omap2/usb-musb.c | 5 +-
4837 arch/arm/mach-omap2/usb-tusb6010.c | 2 +-
4838 arch/arm/mach-omap2/wd_timer.c | 2 +-
4839 arch/arm/mach-omap2/wd_timer.h | 2 +-
4840 arch/arm/mach-socfpga/Kconfig | 1 +
4841 arch/arm/mach-socfpga/Makefile | 1 +
4842 .../include/mach/irqs.h => mach-socfpga/core.h} | 22 +-
4843 arch/arm/mach-socfpga/headsmp.S | 25 +
4844 arch/arm/mach-socfpga/platsmp.c | 116 ++++
4845 arch/arm/mach-socfpga/socfpga.c | 45 +-
4846 arch/arm/mach-ux500/board-mop500.c | 13 +-
4847 arch/arm/mach-ux500/cpu-db8500.c | 3 +
4848 arch/arm/mach-vexpress/Kconfig | 4 +-
4849 arch/arm/mach-vexpress/Makefile | 2 +-
4850 arch/arm/mach-vexpress/ct-ca9x4.c | 41 +-
4851 arch/arm/mach-vexpress/include/mach/motherboard.h | 81 ---
4852 arch/arm/mach-vexpress/platsmp.c | 3 +-
4853 arch/arm/mach-vexpress/reset.c | 141 +++++
4854 arch/arm/mach-vexpress/v2m.c | 349 ++++---------
4855 arch/arm/mach-vt8500/Kconfig | 12 +
4856 arch/arm/mach-vt8500/common.h | 3 +
4857 arch/arm/mach-vt8500/include/mach/entry-macro.S | 26 -
4858 arch/arm/mach-vt8500/include/mach/hardware.h | 12 -
4859 arch/arm/mach-vt8500/include/mach/i8042.h | 18 -
4860 arch/arm/mach-vt8500/include/mach/restart.h | 17 -
4861 arch/arm/mach-vt8500/irq.c | 108 ++--
4862 arch/arm/mach-vt8500/timer.c | 2 +-
4863 arch/arm/mach-vt8500/vt8500.c | 3 +-
4864 arch/arm/plat-mxc/Kconfig | 89 ----
4865 arch/arm/plat-mxc/Makefile | 24 -
4866 arch/arm/plat-mxc/include/mach/irqs.h | 21 -
4867 arch/arm/plat-mxc/include/mach/timex.h | 22 -
4868 arch/arm/plat-mxc/include/mach/uncompress.h | 132 -----
4869 arch/arm/plat-omap/Makefile | 3 +-
4870 arch/arm/plat-omap/clock.c | 544 -------------------
4871 arch/arm/plat-omap/common.c | 25 +-
4872 arch/arm/plat-omap/{include/plat => }/common.h | 10 +-
4873 arch/arm/plat-omap/counter_32k.c | 3 +-
4874 arch/arm/plat-omap/debug-leds.c | 2 +-
4875 arch/arm/plat-omap/dma.c | 30 +-
4876 arch/arm/plat-omap/dmtimer.c | 3 +-
4877 arch/arm/plat-omap/fb.c | 61 +++
4878 arch/arm/plat-omap/fpga.h | 74 +++
4879 arch/arm/plat-omap/i2c.c | 133 +----
4880 arch/arm/plat-omap/i2c.h | 47 ++
4881 .../include/{plat/dma.h => plat-omap/dma-omap.h} | 181 +------
4882 arch/arm/plat-omap/include/plat/clkdev_omap.h | 51 --
4883 arch/arm/plat-omap/include/plat/clock.h | 309 -----------
4884 arch/arm/plat-omap/include/plat/cpu.h | 468 +----------------
4885 arch/arm/plat-omap/include/plat/dma-44xx.h | 147 ------
4886 arch/arm/plat-omap/include/plat/fpga.h | 193 -------
4887 arch/arm/plat-omap/include/plat/multi.h | 120 -----
4888 arch/arm/plat-omap/include/plat/omap-secure.h | 14 -
4889 arch/arm/plat-omap/include/plat/sdrc.h | 164 ------
4890 arch/arm/plat-omap/include/plat/sram.h | 105 ----
4891 arch/arm/plat-omap/omap-pm-noop.c | 5 +-
4892 arch/arm/plat-omap/sram.c | 4 +-
4893 arch/arm/plat-omap/sram.h | 109 +++-
4894 drivers/char/hw_random/omap-rng.c | 2 -
4895 drivers/crypto/omap-aes.c | 8 +-
4896 drivers/crypto/omap-sham.c | 10 +-
4897 drivers/dma/imx-dma.c | 137 +++--
4898 drivers/dma/imx-sdma.c | 1 -
4899 drivers/dma/ipu/ipu_idmac.c | 3 +-
4900 drivers/dma/ipu/ipu_irq.c | 3 +-
4901 drivers/dma/omap-dma.c | 11 +-
4902 drivers/hwmon/Kconfig | 8 +
4903 drivers/hwmon/Makefile | 1 +
4904 drivers/hwmon/vexpress.c | 229 ++++++++
4905 drivers/i2c/busses/i2c-imx.c | 40 +-
4906 drivers/media/platform/omap/omap_vout.c | 4 +-
4907 drivers/media/platform/omap/omap_vout_vrfb.c | 6 +-
4908 drivers/media/platform/omap/omap_voutdef.h | 2 +-
4909 drivers/media/platform/omap3isp/isphist.c | 2 +
4910 drivers/media/platform/omap3isp/ispstat.h | 2 +-
4911 drivers/media/platform/soc_camera/mx2_camera.c | 95 +++-
4912 drivers/media/platform/soc_camera/mx3_camera.c | 2 +-
4913 drivers/media/platform/soc_camera/omap1_camera.c | 3 +-
4914 drivers/media/rc/ir-rx51.c | 1 -
4915 drivers/mfd/Kconfig | 6 +
4916 drivers/mfd/Makefile | 1 +
4917 drivers/mfd/vexpress-config.c | 277 ++++++++++
4918 drivers/mfd/vexpress-sysreg.c | 552 ++++++++++++++++++++
4919 drivers/mmc/host/mxcmmc.c | 31 +-
4920 drivers/mmc/host/omap.c | 35 +-
4921 drivers/mmc/host/omap_hsmmc.c | 4 +-
4922 drivers/mtd/nand/mxc_nand.c | 96 ++--
4923 drivers/mtd/nand/omap2.c | 129 ++++-
4924 drivers/mtd/onenand/omap2.c | 11 +-
4925 drivers/pcmcia/omap_cf.c | 2 +-
4926 drivers/rtc/rtc-mxc.c | 34 +-
4927 .../tidspbridge/include/dspbridge/host_os.h | 1 -
4928 drivers/usb/gadget/omap_udc.c | 4 +-
4929 drivers/usb/host/ehci-mxc.c | 1 -
4930 drivers/usb/host/ohci-omap.c | 5 +-
4931 drivers/usb/musb/tusb6010_omap.c | 9 +-
4932 drivers/video/imxfb.c | 38 +-
4933 drivers/video/mx3fb.c | 3 +-
4934 drivers/video/omap/lcd_inn1510.c | 7 +-
4935 drivers/video/omap/lcdc.c | 2 +-
4936 drivers/video/omap/omapfb_main.c | 2 +-
4937 drivers/video/omap/sossi.c | 2 +-
4938 drivers/video/omap2/dss/core.c | 2 +-
4939 drivers/video/omap2/dss/dispc.c | 43 +-
4940 drivers/video/omap2/dss/dss.c | 39 +-
4941 drivers/video/omap2/dss/dss_features.c | 64 ++-
4942 drivers/video/omap2/dss/dss_features.h | 5 +-
4943 drivers/video/omap2/dss/hdmi.c | 3 +-
4944 drivers/video/omap2/omapfb/omapfb-ioctl.c | 2 +-
4945 drivers/video/omap2/omapfb/omapfb-main.c | 8 +-
4946 drivers/video/omap2/omapfb/omapfb-sysfs.c | 2 +-
4947 drivers/video/omap2/vrfb.c | 142 ++++-
4948 drivers/watchdog/imx2_wdt.c | 1 -
4949 .../mach/ipu.h => include/linux/dma/ipu-dma.h | 6 +-
4950 include/linux/platform_data/asoc-imx-ssi.h | 2 +
4951 include/linux/platform_data/dma-imx.h | 4 +-
4952 .../linux/platform_data/leds-omap.h | 2 -
4953 .../linux/platform_data/mmc-omap.h | 48 +-
4954 include/linux/platform_data/mtd-nand-omap2.h | 46 +-
4955 include/linux/platform_data/mtd-onenand-omap2.h | 28 +-
4956 include/linux/vexpress.h | 121 +++++
4957 include/video/omapdss.h | 14 +
4958 .../plat/vrfb.h => include/video/omapvrfb.h | 2 +
4959 sound/soc/fsl/imx-pcm-fiq.c | 1 -
4960 sound/soc/fsl/imx-ssi.c | 1 -
4961 sound/soc/omap/omap-pcm.c | 9 +-
4962 541 files changed, 8461 insertions(+), 5749 deletions(-)
4963 create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt
4964 create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
4965 create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
4966 create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
4967 create mode 100644 Documentation/hwmon/vexpress
4968 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
4969 delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
4970 create mode 100644 arch/arm/configs/clps711x_defconfig
4971 delete mode 100644 arch/arm/configs/edb7211_defconfig
4972 delete mode 100644 arch/arm/configs/fortunet_defconfig
4973 rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%)
4974 delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c
4975 rename arch/arm/mach-clps711x/{edb7211-arch.c => edb7211.c} (56%)
4976 rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
4977 rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
4978 rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
4979 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
4980 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
4981 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
4982 rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
4983 rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%)
4984 rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
4985 rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
4986 rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
4987 rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
4988 rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%)
4989 rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%)
4990 rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%)
4991 rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
4992 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
4993 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
4994 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
4995 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
4996 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
4997 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
4998 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
4999 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
5000 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
5001 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
5002 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
5003 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
5004 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
5005 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
5006 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
5007 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
5008 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
5009 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
5010 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
5011 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%)
5012 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
5013 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%)
5014 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
5015 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
5016 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
5017 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
5018 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
5019 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
5020 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
5021 rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
5022 rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
5023 rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
5024 rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
5025 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
5026 delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
5027 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
5028 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
5029 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
5030 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
5031 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
5032 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
5033 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
5034 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
5035 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
5036 rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
5037 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
5038 rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
5039 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
5040 rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
5041 rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
5042 rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
5043 rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
5044 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
5045 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
5046 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
5047 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
5048 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
5049 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
5050 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
5051 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
5052 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
5053 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
5054 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
5055 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%)
5056 rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
5057 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
5058 rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
5059 rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
5060 rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
5061 rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
5062 rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
5063 rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
5064 create mode 100644 arch/arm/mach-omap1/dma.h
5065 rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/tc.h (100%)
5066 create mode 100644 arch/arm/mach-omap1/mmc.h
5067 create mode 100644 arch/arm/mach-omap1/soc.h
5068 rename arch/arm/mach-omap2/{include/mach => }/board-zoom.h (100%)
5069 create mode 100644 arch/arm/mach-omap2/dma.h
5070 create mode 100644 arch/arm/mach-omap2/gpmc-nand.h
5071 create mode 100644 arch/arm/mach-omap2/gpmc-onenand.h
5072 rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc.h (67%)
5073 rename arch/arm/{plat-omap/include/plat => mach-omap2}/i2c.h (66%)
5074 create mode 100644 arch/arm/mach-omap2/mmc.h
5075 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%)
5076 rename arch/arm/{plat-omap => mach-omap2}/omap_device.c (99%)
5077 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_device.h (99%)
5078 rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (99%)
5079 rename arch/arm/{mach-vt8500/include/mach/irqs.h => mach-socfpga/core.h} (61%)
5080 create mode 100644 arch/arm/mach-socfpga/headsmp.S
5081 create mode 100644 arch/arm/mach-socfpga/platsmp.c
5082 create mode 100644 arch/arm/mach-vexpress/reset.c
5083 create mode 100644 arch/arm/mach-vt8500/Kconfig
5084 delete mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S
5085 delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
5086 delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
5087 delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
5088 delete mode 100644 arch/arm/plat-mxc/Kconfig
5089 delete mode 100644 arch/arm/plat-mxc/Makefile
5090 delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
5091 delete mode 100644 arch/arm/plat-mxc/include/mach/timex.h
5092 delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
5093 delete mode 100644 arch/arm/plat-omap/clock.c
5094 rename arch/arm/plat-omap/{include/plat => }/common.h (89%)
5095 create mode 100644 arch/arm/plat-omap/fpga.h
5096 create mode 100644 arch/arm/plat-omap/i2c.h
5097 rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (61%)
5098 delete mode 100644 arch/arm/plat-omap/include/plat/clkdev_omap.h
5099 delete mode 100644 arch/arm/plat-omap/include/plat/clock.h
5100 delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h
5101 delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
5102 delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
5103 delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
5104 delete mode 100644 arch/arm/plat-omap/include/plat/sdrc.h
5105 delete mode 100644 arch/arm/plat-omap/include/plat/sram.h
5106 create mode 100644 drivers/hwmon/vexpress.c
5107 create mode 100644 drivers/mfd/vexpress-config.c
5108 create mode 100644 drivers/mfd/vexpress-sysreg.c
5109 rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
5110 rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
5111 rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
5112 create mode 100644 include/linux/vexpress.h
5113 rename arch/arm/plat-omap/include/plat/vrfb.h => include/video/omapvrfb.h (95%)
5114 Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
5115 $ git merge bcm2835/for-next
5116 Auto-merging arch/arm/Kconfig
5117 Merge made by the 'recursive' strategy.
5118 .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt | 13 +++++
5119 arch/arm/Kconfig | 5 +-
5120 arch/arm/boot/dts/bcm2835-rpi-b.dts | 15 ++++++
5121 arch/arm/boot/dts/bcm2835.dtsi | 28 +++++++++++
5122 arch/arm/configs/bcm2835_defconfig | 2 -
5123 arch/arm/mach-bcm2835/Makefile.boot | 4 +-
5124 arch/arm/mach-bcm2835/bcm2835.c | 50 +++++++++++++++++++-
5125 arch/arm/mach-bcm2835/include/mach/gpio.h | 1 +
5126 drivers/clk/clk-bcm2835.c | 2 +-
5127 9 files changed, 111 insertions(+), 9 deletions(-)
5128 create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
5129 create mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
5130 Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
5131 $ git merge cortex/for-next
5132 Auto-merging arch/arm/mm/alignment.c
5133 Auto-merging arch/arm/kernel/process.c
5134 Merge made by the 'recursive' strategy.
5135 arch/arm/include/asm/assembler.h | 13 ++-
5136 arch/arm/include/asm/cp15.h | 11 ++-
5137 arch/arm/include/asm/cputype.h | 3 +
5138 arch/arm/include/asm/glue-cache.h | 25 ++++++
5139 arch/arm/include/asm/glue-df.h | 8 ++
5140 arch/arm/include/asm/glue-proc.h | 9 ++
5141 arch/arm/include/asm/irqflags.h | 22 +++--
5142 arch/arm/include/asm/processor.h | 7 ++
5143 arch/arm/include/asm/ptrace.h | 8 ++
5144 arch/arm/include/asm/system_info.h | 1 +
5145 arch/arm/include/uapi/asm/ptrace.h | 36 ++++++--
5146 arch/arm/kernel/asm-offsets.c | 3 +
5147 arch/arm/kernel/entry-common.S | 4 +
5148 arch/arm/kernel/entry-header.S | 148 +++++++++++++++++++++++++++++++++
5149 arch/arm/kernel/entry-v7m.S | 134 ++++++++++++++++++++++++++++++
5150 arch/arm/kernel/head-common.S | 9 +-
5151 arch/arm/kernel/head-nommu.S | 9 +-
5152 arch/arm/kernel/process.c | 4 +
5153 arch/arm/kernel/ptrace.c | 3 +
5154 arch/arm/kernel/setup.c | 13 ++-
5155 arch/arm/kernel/traps.c | 2 +
5156 arch/arm/mm/alignment.c | 2 +
5157 arch/arm/mm/mmu.c | 17 ++++
5158 arch/arm/mm/nommu.c | 2 +
5159 arch/arm/mm/proc-v7m.S | 161 ++++++++++++++++++++++++++++++++++++
5160 25 files changed, 632 insertions(+), 22 deletions(-)
5161 create mode 100644 arch/arm/kernel/entry-v7m.S
5162 create mode 100644 arch/arm/mm/proc-v7m.S
5163 Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
5164 $ git merge ep93xx/ep93xx-for-next
5166 Merge made by the 'recursive' strategy.
5167 Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
5168 $ git merge ixp4xx/next
5169 Merge made by the 'recursive' strategy.
5170 arch/arm/mach-ixp4xx/common-pci.c | 1 +
5171 arch/arm/mach-ixp4xx/common.c | 13 +++----
5172 arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
5173 arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
5174 arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
5175 arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
5176 arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
5177 arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 12 +-----
5178 drivers/char/hw_random/Kconfig | 6 +--
5179 drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
5180 drivers/crypto/Kconfig | 2 +-
5181 drivers/crypto/ixp4xx_crypto.c | 12 +++---
5182 drivers/net/wan/ixp4xx_hss.c | 2 +-
5183 13 files changed, 59 insertions(+), 68 deletions(-)
5184 Merging msm/for-next (a0d271c Linux 3.6)
5185 $ git merge msm/for-next
5187 Merging renesas/next (33e6bc3 Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/boards' into next)
5188 $ git merge renesas/next
5189 Auto-merging arch/arm/boot/dts/Makefile
5190 Merge made by the 'recursive' strategy.
5191 arch/arm/boot/dts/Makefile | 3 +-
5192 arch/arm/boot/dts/sh7372-mackerel.dts | 22 +++++++
5193 arch/arm/configs/armadillo800eva_defconfig | 3 +-
5194 arch/arm/configs/kzm9g_defconfig | 4 ++
5195 arch/arm/configs/mackerel_defconfig | 18 +++++-
5196 arch/arm/configs/marzen_defconfig | 4 ++
5197 arch/arm/mach-shmobile/Kconfig | 1 +
5198 arch/arm/mach-shmobile/board-armadillo800eva.c | 8 +++
5199 arch/arm/mach-shmobile/board-kzm9g.c | 14 ++++-
5200 arch/arm/mach-shmobile/board-mackerel.c | 8 ++-
5201 arch/arm/mach-shmobile/board-marzen.c | 25 ++++++++
5202 arch/arm/mach-shmobile/clock-r8a7779.c | 16 ++++-
5203 arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++
5204 arch/arm/mach-shmobile/setup-r8a7740.c | 18 +++++-
5205 arch/arm/mach-shmobile/setup-r8a7779.c | 77 ++++++++++++++++++++++++
5206 arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++
5207 16 files changed, 237 insertions(+), 8 deletions(-)
5208 create mode 100644 arch/arm/boot/dts/sh7372-mackerel.dts
5209 Merging samsung/for-next (f1d782f Merge branch 'next/board-samsung' into for-next)
5210 $ git merge samsung/for-next
5211 Merge made by the 'recursive' strategy.
5212 .../devicetree/bindings/media/s5p-mfc.txt | 23 ++++
5213 arch/arm/boot/dts/exynos4210-origen.dts | 16 +++
5214 arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +++
5215 arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +
5216 arch/arm/boot/dts/exynos5250.dtsi | 6 +
5217 arch/arm/mach-exynos/Kconfig | 1 +
5218 arch/arm/mach-exynos/clock-exynos4.c | 5 -
5219 arch/arm/mach-exynos/clock-exynos5.c | 7 +-
5220 arch/arm/mach-exynos/mach-exynos5-dt.c | 16 +++
5221 arch/arm/mach-exynos/mach-nuri.c | 1 -
5222 arch/arm/mach-exynos/mach-universal_c210.c | 1 -
5223 arch/arm/mach-s3c64xx/mach-crag6410-module.c | 141 ++++++++++++++++----
5224 arch/arm/mach-s3c64xx/mach-crag6410.c | 29 +++-
5225 arch/arm/mach-s5pv210/mach-goni.c | 1 -
5226 arch/arm/plat-samsung/clock.c | 75 ++++++++++-
5227 arch/arm/plat-samsung/devs.c | 1 +
5228 arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
5229 arch/arm/plat-samsung/include/plat/mfc.h | 11 ++
5230 arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +++++
5231 arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
5232 drivers/gpio/gpio-samsung.c | 25 ++--
5233 21 files changed, 372 insertions(+), 52 deletions(-)
5234 create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
5235 Merging tegra/for-next (38711a8 Merge branch 'for-3.8/defconfig' into for-next)
5236 $ git merge tegra/for-next
5237 Auto-merging include/linux/tegra-ahb.h
5238 Auto-merging drivers/iommu/tegra-smmu.c
5239 Auto-merging drivers/crypto/tegra-aes.c
5240 Removing arch/arm/mach-tegra/include/mach/irqs.h
5241 Removing arch/arm/mach-tegra/include/mach/dma.h
5242 Auto-merging arch/arm/Kconfig
5243 Merge made by the 'recursive' strategy.
5244 .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt | 19 ++
5245 .../bindings/timer/nvidia,tegra20-timer.txt | 21 +++
5246 .../bindings/timer/nvidia,tegra30-timer.txt | 23 +++
5247 arch/arm/Kconfig | 1 +
5248 arch/arm/boot/dts/tegra20-harmony.dts | 63 ++-----
5249 arch/arm/boot/dts/tegra20-paz00.dts | 59 ++-----
5250 arch/arm/boot/dts/tegra20-seaboard.dts | 65 +++----
5251 arch/arm/boot/dts/tegra20-tamonten.dtsi | 63 ++-----
5252 arch/arm/boot/dts/tegra20-ventana.dts | 144 ++++++++++------
5253 arch/arm/boot/dts/tegra20-whistler.dts | 119 ++++---------
5254 arch/arm/boot/dts/tegra20.dtsi | 21 +++
5255 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 +
5256 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 +
5257 arch/arm/boot/dts/tegra30-cardhu.dtsi | 74 ++++----
5258 arch/arm/boot/dts/tegra30.dtsi | 23 +++
5259 arch/arm/configs/tegra_defconfig | 1 +
5260 arch/arm/mach-tegra/apbio.c | 3 -
5261 arch/arm/mach-tegra/board-dt-tegra20.c | 5 +-
5262 arch/arm/mach-tegra/board-dt-tegra30.c | 4 +
5263 arch/arm/mach-tegra/clock.c | 2 -
5264 arch/arm/mach-tegra/cpu-tegra.c | 3 -
5265 arch/arm/mach-tegra/cpuidle.c | 44 +----
5266 arch/arm/mach-tegra/include/mach/dma.h | 54 ------
5267 arch/arm/mach-tegra/include/mach/irqs.h | 182 --------------------
5268 arch/arm/mach-tegra/include/mach/powergate.h | 2 +
5269 arch/arm/mach-tegra/pcie.c | 3 +
5270 arch/arm/mach-tegra/platsmp.c | 1 -
5271 arch/arm/mach-tegra/sleep-t20.S | 2 -
5272 arch/arm/mach-tegra/sleep-t30.S | 2 -
5273 arch/arm/mach-tegra/tegra20_clocks_data.c | 2 -
5274 arch/arm/mach-tegra/tegra2_emc.c | 2 -
5275 arch/arm/mach-tegra/timer.c | 40 +++--
5276 drivers/amba/tegra-ahb.c | 1 +
5277 drivers/crypto/tegra-aes.c | 2 -
5278 drivers/iommu/tegra-smmu.c | 4 +-
5279 drivers/staging/nvec/nvec.c | 1 -
5280 .../include/mach => include/linux}/tegra-ahb.h | 6 +-
5281 sound/soc/tegra/tegra30_ahub.c | 1 -
5282 sound/soc/tegra/tegra_pcm.h | 2 -
5283 39 files changed, 389 insertions(+), 687 deletions(-)
5284 create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
5285 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
5286 create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
5287 delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
5288 delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
5289 rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
5290 Merging kvmtool/master (58bd23d kvm tools: Fix reported RTC century and year)
5291 $ git merge kvmtool/master
5292 Merge made by the 'recursive' strategy.
5293 tools/kvm/Makefile | 3 +++
5294 tools/kvm/builtin-balloon.c | 4 ++--
5295 tools/kvm/builtin-run.c | 17 +++++++++++++++--
5296 tools/kvm/builtin-setup.c | 4 ----
5297 tools/kvm/disk/core.c | 2 ++
5298 tools/kvm/hw/rtc.c | 30 ++++++++++++++++++------------
5299 tools/kvm/hw/serial.c | 10 +++++-----
5300 tools/kvm/include/kvm/kvm.h | 6 ++++++
5301 tools/kvm/include/kvm/mutex.h | 20 +++++++++++++-------
5302 tools/kvm/include/kvm/parse-options.h | 22 +++++++++++-----------
5303 tools/kvm/include/kvm/qcow.h | 2 +-
5304 tools/kvm/include/kvm/threadpool.h | 4 ++--
5305 tools/kvm/include/kvm/uip.h | 10 +++++-----
5306 tools/kvm/ioeventfd.c | 2 ++
5307 tools/kvm/kvm-ipc.c | 2 ++
5308 tools/kvm/net/uip/buf.c | 4 ++--
5309 tools/kvm/net/uip/core.c | 6 +++---
5310 tools/kvm/net/uip/tcp.c | 9 ++++++---
5311 tools/kvm/net/uip/udp.c | 5 ++++-
5312 tools/kvm/pci.c | 4 ++--
5313 tools/kvm/ui/sdl.c | 2 ++
5314 tools/kvm/ui/vnc.c | 2 ++
5315 tools/kvm/util/threadpool.c | 10 ++++++----
5316 tools/kvm/virtio/blk.c | 6 ++++--
5317 tools/kvm/virtio/console.c | 4 ++--
5318 tools/kvm/virtio/net.c | 18 +++++++++++-------
5319 tools/kvm/virtio/pci.c | 2 +-
5320 27 files changed, 132 insertions(+), 78 deletions(-)
5321 Merging dma-mapping/dma-mapping-next (4e85fb8 ARM: mm: Remove unused arm_vmregion priv field)
5322 $ git merge dma-mapping/dma-mapping-next
5324 Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
5325 $ git merge pwm/for-next
5327 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
5328 $ git merge dma-buf/for-next
5329 Auto-merging drivers/base/dma-buf.c
5330 Merge made by the 'recursive' strategy.
5331 drivers/base/dma-buf.c | 2 ++
5332 1 file changed, 2 insertions(+)
5333 Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
5334 $ git merge userns/for-next
5336 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
5337 $ git merge ktest/for-next
5339 Merging signal/for-next (8a7d0dd Merge branch 'arch-s390' into for-next)
5340 $ git merge signal/for-next
5341 Recorded preimage for 'arch/sparc/kernel/sys_sparc_64.c'
5342 Auto-merging include/linux/sched.h
5343 Auto-merging arch/sparc/kernel/systbls_64.S
5344 Auto-merging arch/sparc/kernel/sys_sparc_64.c
5345 CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
5346 Auto-merging arch/sparc/kernel/process_64.c
5347 Auto-merging arch/sparc/include/asm/thread_info_64.h
5348 Auto-merging arch/sparc/include/asm/processor_64.h
5349 Auto-merging arch/s390/kernel/entry64.S
5350 Auto-merging arch/powerpc/include/asm/unistd.h
5351 Auto-merging arch/mips/kernel/scall64-n32.S
5352 Auto-merging arch/mips/kernel/mips_ksyms.c
5353 Auto-merging arch/mips/Kconfig
5354 Automatic merge failed; fix conflicts and then commit the result.
5356 Recorded resolution for 'arch/sparc/kernel/sys_sparc_64.c'.
5357 [master b9cd564] Merge remote-tracking branch 'signal/for-next'
5358 $ git diff -M --stat --summary HEAD^..
5359 arch/alpha/kernel/entry.S | 21 +--
5360 arch/alpha/kernel/process.c | 49 +++----
5361 arch/alpha/kernel/signal.c | 16 +--
5362 arch/arm64/Kconfig | 2 +
5363 arch/arm64/include/asm/processor.h | 5 -
5364 arch/arm64/include/asm/syscalls.h | 14 +-
5365 arch/arm64/include/asm/unistd.h | 1 +
5366 arch/arm64/include/asm/unistd32.h | 8 +-
5367 arch/arm64/kernel/entry.S | 17 +--
5368 arch/arm64/kernel/process.c | 83 +++++-------
5369 arch/arm64/kernel/sys.c | 76 +----------
5370 arch/arm64/kernel/sys32.S | 19 ---
5371 arch/arm64/kernel/sys_compat.c | 38 +-----
5372 arch/c6x/Kconfig | 1 +
5373 arch/c6x/include/uapi/asm/unistd.h | 1 -
5374 arch/c6x/kernel/entry.S | 12 +-
5375 arch/frv/Kconfig | 1 +
5376 arch/frv/include/asm/unistd.h | 1 -
5377 arch/frv/kernel/entry.S | 28 +---
5378 arch/hexagon/Kconfig | 2 +
5379 arch/hexagon/include/asm/processor.h | 1 -
5380 arch/hexagon/include/uapi/asm/ptrace.h | 4 +
5381 arch/hexagon/include/uapi/asm/unistd.h | 1 +
5382 arch/hexagon/kernel/process.c | 102 +++++----------
5383 arch/hexagon/kernel/signal.c | 4 +-
5384 arch/hexagon/kernel/syscall.c | 44 +------
5385 arch/hexagon/kernel/vm_entry.S | 4 +
5386 arch/ia64/Kconfig | 2 +
5387 arch/ia64/include/asm/processor.h | 16 ---
5388 arch/ia64/include/asm/unistd.h | 1 +
5389 arch/ia64/kernel/entry.S | 39 +++---
5390 arch/ia64/kernel/head.S | 13 --
5391 arch/ia64/kernel/process.c | 158 +++++++++-------------
5392 arch/m68k/Kconfig | 1 +
5393 arch/m68k/include/asm/unistd.h | 1 -
5394 arch/m68k/kernel/entry.S | 7 -
5395 arch/mips/Kconfig | 2 +
5396 arch/mips/include/asm/processor.h | 2 -
5397 arch/mips/include/asm/ptrace.h | 6 +
5398 arch/mips/include/asm/unistd.h | 1 +
5399 arch/mips/kernel/entry.S | 6 +
5400 arch/mips/kernel/linux32.c | 21 ---
5401 arch/mips/kernel/mips_ksyms.c | 2 -
5402 arch/mips/kernel/process.c | 62 ++++-----
5403 arch/mips/kernel/scall64-n32.S | 2 +-
5404 arch/mips/kernel/scall64-o32.S | 2 +-
5405 arch/mips/kernel/syscall.c | 53 --------
5406 arch/openrisc/Kconfig | 2 +
5407 arch/openrisc/include/uapi/asm/unistd.h | 2 +
5408 arch/openrisc/kernel/entry.S | 43 +++---
5409 arch/openrisc/kernel/process.c | 163 ++++++++---------------
5410 arch/parisc/Kconfig | 2 +
5411 arch/parisc/include/asm/unistd.h | 1 +
5412 arch/parisc/kernel/entry.S | 217 +++----------------------------
5413 arch/parisc/kernel/process.c | 96 +++-----------
5414 arch/parisc/kernel/sys_parisc32.c | 22 ----
5415 arch/parisc/kernel/syscall_table.S | 2 +-
5416 arch/powerpc/Kconfig | 1 +
5417 arch/powerpc/include/asm/unistd.h | 1 -
5418 arch/powerpc/kernel/entry_32.S | 5 -
5419 arch/powerpc/kernel/entry_64.S | 8 +-
5420 arch/powerpc/kernel/process.c | 41 ++----
5421 arch/s390/Kconfig | 1 +
5422 arch/s390/include/asm/unistd.h | 1 -
5423 arch/s390/kernel/entry.S | 32 +----
5424 arch/s390/kernel/entry64.S | 26 +---
5425 arch/sparc/Kconfig | 2 +
5426 arch/sparc/include/asm/processor_32.h | 1 -
5427 arch/sparc/include/asm/processor_64.h | 11 +-
5428 arch/sparc/include/asm/ptrace.h | 10 +-
5429 arch/sparc/include/asm/switch_to_64.h | 2 +-
5430 arch/sparc/include/asm/syscalls.h | 2 -
5431 arch/sparc/include/asm/thread_info_64.h | 25 ++--
5432 arch/sparc/include/asm/uaccess_64.h | 4 +-
5433 arch/sparc/include/asm/unistd.h | 1 +
5434 arch/sparc/kernel/entry.S | 51 ++++----
5435 arch/sparc/kernel/etrap_64.S | 8 +-
5436 arch/sparc/kernel/process_32.c | 152 +++++++---------------
5437 arch/sparc/kernel/process_64.c | 143 +++++---------------
5438 arch/sparc/kernel/sys_sparc32.c | 36 -----
5439 arch/sparc/kernel/sys_sparc_32.c | 24 ----
5440 arch/sparc/kernel/sys_sparc_64.c | 22 ----
5441 arch/sparc/kernel/syscalls.S | 30 ++---
5442 arch/sparc/kernel/systbls_64.S | 2 +-
5443 arch/sparc/kernel/traps_64.c | 4 +-
5444 arch/sparc/mm/init_64.c | 2 +-
5445 arch/tile/Kconfig | 2 +
5446 arch/tile/include/asm/compat.h | 15 +--
5447 arch/tile/include/asm/elf.h | 1 +
5448 arch/tile/include/asm/processor.h | 4 +
5449 arch/tile/include/asm/switch_to.h | 5 +-
5450 arch/tile/include/asm/syscalls.h | 20 ++-
5451 arch/tile/include/asm/unistd.h | 1 +
5452 arch/tile/kernel/compat.c | 5 +-
5453 arch/tile/kernel/compat_signal.c | 10 +-
5454 arch/tile/kernel/entry.S | 11 --
5455 arch/tile/kernel/intvec_32.S | 29 +++--
5456 arch/tile/kernel/intvec_64.S | 30 +++--
5457 arch/tile/kernel/process.c | 170 +++++++-----------------
5458 arch/tile/kernel/signal.c | 9 +-
5459 arch/tile/kernel/sys.c | 9 +-
5460 arch/tile/mm/fault.c | 5 +-
5461 arch/um/kernel/process.c | 2 -
5462 arch/um/kernel/syscall.c | 8 +-
5463 drivers/staging/gdm72xx/gdm_usb.c | 4 +-
5465 fs/fs_struct.c | 24 ----
5466 include/linux/compat.h | 2 -
5467 include/linux/fdtable.h | 1 -
5468 include/linux/fs_struct.h | 1 -
5469 include/linux/sched.h | 1 -
5470 kernel/exit.c | 92 -------------
5471 112 files changed, 692 insertions(+), 1925 deletions(-)
5472 Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
5473 $ git merge clk/clk-next
5475 Merging random/dev (c5c1244 random: fix debug format strings)
5476 $ git merge random/dev
5477 Merge made by the 'recursive' strategy.
5478 drivers/char/random.c | 14 +++++---------
5479 1 file changed, 5 insertions(+), 9 deletions(-)
5480 Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
5481 $ git merge lzo-update/lzo-update
5482 Removing lib/lzo/lzo1x_decompress.c
5483 Auto-merging crypto/testmgr.h
5484 Merge made by the 'recursive' strategy.
5485 crypto/testmgr.h | 38 ++---
5486 include/linux/lzo.h | 15 +-
5487 lib/decompress_unlzo.c | 2 +-
5488 lib/lzo/Makefile | 2 +-
5489 lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++----------------
5490 lib/lzo/lzo1x_decompress.c | 255 -----------------------------
5491 lib/lzo/lzo1x_decompress_safe.c | 237 +++++++++++++++++++++++++++
5492 lib/lzo/lzodefs.h | 34 +++-
5493 8 files changed, 488 insertions(+), 430 deletions(-)
5494 delete mode 100644 lib/lzo/lzo1x_decompress.c
5495 create mode 100644 lib/lzo/lzo1x_decompress_safe.c
5496 Merging drop-experimental/linux-next (db298b3 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
5497 $ git merge drop-experimental/linux-next
5498 Auto-merging net/sctp/Kconfig
5499 Auto-merging net/mac80211/Kconfig
5500 Auto-merging init/Kconfig
5501 Auto-merging drivers/net/usb/Kconfig
5502 Auto-merging drivers/mmc/host/Kconfig
5503 Auto-merging crypto/Kconfig
5504 Auto-merging arch/x86/Kconfig
5505 Auto-merging arch/ia64/Kconfig
5506 Merge made by the 'recursive' strategy.
5507 arch/cris/arch-v32/drivers/Kconfig | 4 +--
5508 arch/ia64/Kconfig | 8 ++---
5509 arch/ia64/kvm/Kconfig | 2 +-
5510 arch/ia64/xen/Kconfig | 2 +-
5511 arch/powerpc/platforms/ps3/Kconfig | 2 +-
5512 arch/s390/kvm/Kconfig | 2 +-
5513 arch/um/Kconfig.net | 2 +-
5514 arch/um/Kconfig.um | 8 ++---
5515 arch/x86/Kconfig | 22 ++++++------
5516 arch/x86/um/Kconfig | 3 +-
5517 crypto/Kconfig | 15 +++-----
5518 drivers/i2c/muxes/Kconfig | 2 --
5519 drivers/ide/Kconfig | 8 ++---
5520 drivers/lguest/Kconfig | 2 +-
5521 drivers/media/Kconfig | 7 ++--
5522 drivers/media/pci/cx25821/Kconfig | 2 +-
5523 drivers/media/platform/s5p-fimc/Kconfig | 1 -
5524 drivers/media/platform/s5p-tv/Kconfig | 3 +-
5525 drivers/media/usb/pvrusb2/Kconfig | 8 ++---
5526 drivers/mmc/core/Kconfig | 3 +-
5527 drivers/mmc/host/Kconfig | 20 +++++------
5528 drivers/net/Kconfig | 9 +++--
5529 drivers/net/ethernet/8390/Kconfig | 21 +++++------
5530 drivers/net/ethernet/atheros/Kconfig | 8 ++---
5531 drivers/net/ethernet/dec/tulip/Kconfig | 4 +--
5532 drivers/net/ethernet/i825xx/Kconfig | 12 +++----
5533 drivers/net/ethernet/intel/Kconfig | 9 ++---
5534 drivers/net/ethernet/natsemi/Kconfig | 3 --
5535 drivers/net/ethernet/packetengines/Kconfig | 4 +--
5536 drivers/net/ethernet/realtek/Kconfig | 4 +--
5537 drivers/net/ethernet/silan/Kconfig | 6 ++--
5538 drivers/net/ethernet/ti/Kconfig | 4 +--
5539 drivers/net/team/Kconfig | 3 +-
5540 drivers/net/usb/Kconfig | 16 ++++-----
5541 drivers/net/wan/Kconfig | 8 ++---
5542 drivers/ptp/Kconfig | 1 -
5543 drivers/rpmsg/Kconfig | 3 +-
5544 drivers/sbus/char/Kconfig | 7 ++--
5545 drivers/virtio/Kconfig | 8 ++---
5546 fs/ceph/Kconfig | 4 +--
5547 fs/ecryptfs/Kconfig | 4 +--
5548 fs/nilfs2/Kconfig | 3 +-
5549 fs/xfs/Kconfig | 4 +--
5550 init/Kconfig | 54 +++++++---------------------
5551 net/9p/Kconfig | 2 +-
5553 net/ceph/Kconfig | 4 +--
5554 net/dccp/Kconfig | 4 +--
5555 net/dccp/ccids/Kconfig | 5 ++-
5556 net/decnet/Kconfig | 4 +--
5557 net/decnet/netfilter/Kconfig | 2 +-
5558 net/dsa/Kconfig | 2 +-
5559 net/ieee802154/Kconfig | 3 +-
5560 net/ipv4/Kconfig | 11 +-----
5561 net/ipv4/netfilter/Kconfig | 4 +--
5562 net/ipv6/Kconfig | 24 ++++++-------
5563 net/l2tp/Kconfig | 4 +--
5564 net/lapb/Kconfig | 3 +-
5565 net/mac80211/Kconfig | 2 +-
5566 net/mac802154/Kconfig | 2 +-
5567 net/netfilter/Kconfig | 24 +++++--------
5568 net/rds/Kconfig | 4 +--
5569 net/rxrpc/Kconfig | 2 +-
5570 net/sctp/Kconfig | 4 +--
5571 net/sunrpc/Kconfig | 2 +-
5572 net/tipc/Kconfig | 4 +--
5573 net/wanrouter/Kconfig | 1 -
5574 net/x25/Kconfig | 3 +-
5575 net/xfrm/Kconfig | 16 ++++-----
5576 tools/lguest/lguest.txt | 8 ++---
5577 70 files changed, 186 insertions(+), 288 deletions(-)
5578 Merging scsi-post-merge/merge-base:master ()
5579 Merging akpm-current/current (417b23b revert "epoll: support for disabling items, and a self-test app")
5580 $ git merge akpm-current/current
5581 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.
5582 Removing tools/testing/selftests/epoll/Makefile
5583 Automatic merge failed; fix conflicts and then commit the result.
5584 $ git rm -f tools/testing/selftests/epoll/test_epoll.c
5585 tools/testing/selftests/epoll/test_epoll.c: needs merge
5586 rm 'tools/testing/selftests/epoll/test_epoll.c'
5588 [master f15f35a] Merge branch 'akpm-current/current'
5589 $ git diff -M --stat --summary HEAD^..
5590 fs/eventpoll.c | 38 +--
5591 include/uapi/linux/eventpoll.h | 1 -
5592 tools/testing/selftests/Makefile | 2 +-
5593 tools/testing/selftests/epoll/Makefile | 11 -
5594 tools/testing/selftests/epoll/test_epoll.c | 344 ----------------------------
5595 5 files changed, 4 insertions(+), 392 deletions(-)
5596 delete mode 100644 tools/testing/selftests/epoll/Makefile
5597 delete mode 100644 tools/testing/selftests/epoll/test_epoll.c
5598 $ git clone -s -l -n -q . ../rebase-tmp
5600 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
5602 * [new branch] akpm/master -> akpm
5603 $ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
5605 * [new branch] akpm/master-base -> akpm-base
5607 Switched to branch 'akpm'
5608 $ git rebase --onto master akpm-base
5609 First, rewinding head to replay your work on top of it...
5610 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
5611 Applying: proc: check vma->vm_file before dereferencing
5612 Applying: memstick: remove unused field from state struct
5613 Applying: memstick: ms_block: fix compile issue
5614 Applying: memstick: use after free in msb_disk_release()
5615 Applying: memstick: memory leak on error in msb_ftl_scan()
5616 Applying: CRIS: Fix I/O macros
5617 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
5618 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
5619 Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
5620 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
5621 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
5622 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
5623 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
5624 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
5625 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
5626 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
5627 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
5628 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
5629 Applying: x86 numa: don't check if node is NUMA_NO_NODE
5630 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
5631 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
5632 Applying: olpc: fix olpc-xo1-sci.c build errors
5633 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
5634 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
5635 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
5636 Applying: timeconst.pl: remove deprecated defined(@array)
5637 Applying: time: don't inline EXPORT_SYMBOL functions
5638 Applying: fs/pstore/ram.c: fix up section annotations
5639 Applying: h8300: select generic atomic64_t support
5640 Applying: drivers/message/fusion/mptscsih.c: missing break
5641 Applying: cciss: cleanup bitops usage
5642 Applying: cciss: use check_signature()
5643 Applying: block: store partition_meta_info.uuid as a string
5644 Applying: init: reduce PARTUUID min length to 1 from 36
5645 Applying: block: partition: msdos: provide UUIDs for partitions
5646 Applying: drbd: use copy_highpage
5647 Applying: vfs: increment iversion when a file is truncated
5648 Applying: fs: change return values from -EACCES to -EPERM
5649 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
5650 Applying: mm/page_alloc.c: remove duplicate check
5651 Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
5652 Applying: mm: show migration types in show_mem
5653 Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
5654 Applying: memory hotplug: suppress "Device nodeX does not have a release() function" warning
5655 Applying: mm, memcg: make mem_cgroup_out_of_memory() static
5656 Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
5657 Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
5658 Applying: thp: clean up __collapse_huge_page_isolate
5659 Applying: thp-clean-up-__collapse_huge_page_isolate v2
5660 Applying: mm: introduce mm_find_pmd()
5661 Applying: thp: introduce hugepage_vma_check()
5662 Applying: thp: cleanup: introduce mk_huge_pmd()
5663 Applying: memory-hotplug: skip HWPoisoned page when offlining pages
5664 Applying: memory-hotplug: update mce_bad_pages when removing the memory
5665 Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
5666 Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
5667 Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
5668 Applying: memory-hotplug: allocate zone's pcp before onlining pages
5669 Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
5670 Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
5671 Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
5672 Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
5673 Applying: slab: ignore internal flags in cache creation
5674 Applying: drop_caches: add some documentation and info messsge
5675 Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
5676 Applying: swap: add a simple detector for inappropriate swapin readahead
5677 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
5678 Applying: mm/memblock: reduce overhead in binary search
5679 Applying: scripts/pnmtologo: fix for plain PBM
5680 Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
5681 Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
5682 Applying: scripts/tags.sh: add magic for declarations of popular kernel type
5683 Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
5684 Applying: backlight: 88pm860x_bl: fix checkpatch warning
5685 Applying: backlight: atmel-pwm-bl: fix checkpatch warning
5686 Applying: backlight: corgi_lcd: fix checkpatch error and warning
5687 Applying: backlight: da903x_bl: fix checkpatch warning
5688 Applying: backlight: generic_bl: fix checkpatch warning
5689 Applying: backlight: hp680_bl: fix checkpatch error and warning
5690 Applying: backlight: ili9320: fix checkpatch error and warning
5691 Applying: backlight: jornada720: fix checkpatch error and warning
5692 Applying: backlight: l4f00242t03: fix checkpatch warning
5693 Applying: backlight: lm3630: fix checkpatch warning
5694 Applying: backlight: locomolcd: fix checkpatch error and warning
5695 Applying: backlight: omap1: fix checkpatch warning
5696 Applying: backlight: pcf50633: fix checkpatch warning
5697 Applying: backlight: platform_lcd: fix checkpatch error
5698 Applying: backlight: tdo24m: fix checkpatch warning
5699 Applying: backlight: tosa: fix checkpatch error and warning
5700 Applying: backlight: vgg2432a4: fix checkpatch warning
5701 Applying: backlight: lms283gf05: use devm_gpio_request_one
5702 Applying: backlight: tosa: use devm_gpio_request_one
5703 Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
5704 Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
5705 Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
5706 Applying: drivers/video/backlight/da9052_bl.c: add missing const
5707 Applying: drivers/video/backlight/lms283gf05.c: add missing const
5708 Applying: drivers/video/backlight/tdo24m.c: add missing const
5709 Applying: drivers/video/backlight/vgg2432a4.c: add missing const
5710 Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
5711 Applying: string: introduce helper to get base file name from given path
5712 Applying: lib: dynamic_debug: use kbasename()
5713 Applying: mm: use kbasename()
5714 Applying: procfs: use kbasename()
5715 Applying: trace: use kbasename()
5716 Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
5717 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
5718 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
5719 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
5720 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
5721 Applying: checkpatch: improve network block comment style checking
5722 Applying: binfmt_elf: fix corner case kfree of uninitialized data
5723 Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
5724 Applying: rtc: omap: kicker mechanism support
5725 Applying: ARM: davinci: remove rtc kicker release
5726 Applying: rtc: omap: dt support
5727 Applying: rtc: omap: depend on am33xx
5728 Applying: rtc: omap: add runtime pm support
5729 Applying: drivers/rtc/rtc-imxdi: support for i.MX53
5730 Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
5731 Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
5732 Applying: hfsplus: add on-disk layout declarations related to attributes tree
5733 Applying: hfsplus: add functionality of manipulating by records in attributes tree
5734 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
5735 Applying: hfsplus: add support of manipulation by attributes file
5736 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
5737 Applying: hfsplus: code style fixes - reworked support of extended attributes
5738 Applying: fat: modify nfs mount option
5739 Applying: fat (exportfs): rebuild inode if ilookup() fails
5740 Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
5741 Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails
5742 Applying: Documentation: update nfs option in filesystem/vfat.txt
5743 Applying: kstrto*: add documentation
5744 Applying: simple_strto*: annotate function as obsolete
5745 Applying: proc: don't show nonexistent capabilities
5746 Applying: procfs: add VmFlags field in smaps output
5747 Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
5748 Applying: ipc: remove forced assignment of selected message
5749 Applying: ipc: add sysctl to specify desired next object id
5750 Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
5751 Applying: ipc: message queue receive cleanup
5752 Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
5753 Applying: ipc: message queue copy feature introduced
5754 Applying: selftests: IPC message queue copy feature test
5755 Applying: selftests-ipc-message-queue-copy-feature-test-checkpatch-fixes
5756 Applying: ipc/sem.c: alternatives to preempt_disable()
5757 Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
5758 Applying: Documentation/sparse.txt: document context annotations for lock checking
5759 Applying: aoe: describe the behavior of the "err" character device
5760 Applying: aoe: print warning regarding a common reason for dropped transmits
5761 Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
5762 Applying: aoe: avoid using skb member after dev_queue_xmit
5763 Applying: aoe: update cap on outstanding commands based on config query response
5764 Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
5765 Applying: aoe: support larger I/O requests via aoe_maxsectors module param
5766 Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
5767 Applying: aoe: cleanup: remove unused ata_scnt function
5768 Applying: aoe: whitespace cleanup
5769 Applying: aoe: update driver-internal version number to 60
5770 Applying: documentation-dma-api-howtotxt-add-dma-mapping-error-check-usage-examples-fix
5771 Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
5772 Applying: mm-introduce-mm_find_pmd-fix
5774 $ git fetch -f ../rebase-tmp akpm:akpm/master
5776 + 822854b...4c8b1d3 akpm -> akpm/master (forced update)
5777 $ rm -rf ../rebase-tmp
5778 Merging akpm/master (4c8b1d3 mm-introduce-mm_find_pmd-fix)
5779 $ git merge --no-ff akpm/master
5780 Merge made by the 'recursive' strategy.
5781 Documentation/DMA-API-HOWTO.txt | 2 +-
5782 Documentation/DocBook/kernel-api.tmpl | 3 +
5783 Documentation/backlight/lp855x-driver.txt | 10 +-
5784 .../devicetree/bindings/rtc/imxdi-rtc.txt | 17 +
5785 Documentation/devicetree/bindings/rtc/rtc-omap.txt | 17 +
5786 Documentation/filesystems/proc.txt | 40 +-
5787 Documentation/filesystems/vfat.txt | 23 +-
5788 Documentation/memory-hotplug.txt | 5 +-
5789 Documentation/sparse.txt | 18 +
5790 Documentation/sysctl/vm.txt | 33 +-
5791 arch/arm/mach-davinci/devices-da8xx.c | 13 +-
5792 arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
5793 arch/arm64/include/asm/unistd.h | 1 +
5794 arch/arm64/kernel/sys_compat.c | 15 -
5795 arch/cris/include/asm/io.h | 39 +-
5796 arch/h8300/Kconfig | 1 +
5797 arch/powerpc/include/asm/machdep.h | 36 +-
5798 arch/powerpc/include/asm/systbl.h | 2 +-
5799 arch/powerpc/include/asm/unistd.h | 1 +
5800 arch/powerpc/kernel/sys_ppc32.c | 17 +-
5801 arch/sparc/include/asm/unistd.h | 1 +
5802 arch/sparc/kernel/sys_sparc32.c | 14 -
5803 arch/tile/include/asm/compat.h | 2 -
5804 arch/tile/include/asm/unistd.h | 1 +
5805 arch/tile/kernel/compat.c | 18 -
5806 arch/x86/Kconfig | 1 +
5807 arch/x86/include/asm/uv/uv.h | 2 +-
5808 arch/x86/kernel/acpi/boot.c | 7 +-
5809 arch/x86/mm/numa.c | 3 +-
5810 arch/x86/platform/iris/iris.c | 67 ++-
5811 arch/x86/platform/uv/tlb_uv.c | 10 +-
5812 arch/x86/tools/insn_sanity.c | 10 +-
5813 block/genhd.c | 8 +-
5814 block/partitions/efi.c | 7 +-
5815 block/partitions/msdos.c | 21 +-
5816 drivers/acpi/acpi_memhotplug.c | 123 +++--
5817 drivers/base/memory.c | 9 +-
5818 drivers/base/node.c | 11 +
5819 drivers/block/aoe/aoe.h | 10 +-
5820 drivers/block/aoe/aoeblk.c | 19 +
5821 drivers/block/aoe/aoechr.c | 7 +-
5822 drivers/block/aoe/aoecmd.c | 22 +-
5823 drivers/block/aoe/aoedev.c | 44 +-
5824 drivers/block/aoe/aoemain.c | 2 +-
5825 drivers/block/aoe/aoenet.c | 13 +-
5826 drivers/block/cciss.c | 21 +-
5827 drivers/block/drbd/drbd_bitmap.c | 7 +-
5828 drivers/firmware/dmi_scan.c | 78 ++-
5829 drivers/gpu/drm/i915/intel_pm.c | 3 +-
5830 drivers/memstick/core/ms_block.c | 8 +-
5831 drivers/memstick/core/ms_block.h | 5 +-
5832 drivers/message/fusion/mptscsih.c | 1 +
5833 drivers/pcmcia/cs.c | 37 +-
5834 drivers/rtc/Kconfig | 12 +-
5835 drivers/rtc/rtc-imxdi.c | 11 +
5836 drivers/rtc/rtc-omap.c | 80 ++-
5837 drivers/video/backlight/88pm860x_bl.c | 4 +-
5838 drivers/video/backlight/atmel-pwm-bl.c | 7 +-
5839 drivers/video/backlight/corgi_lcd.c | 16 +-
5840 drivers/video/backlight/da903x_bl.c | 15 +-
5841 drivers/video/backlight/da9052_bl.c | 2 +-
5842 drivers/video/backlight/generic_bl.c | 4 +-
5843 drivers/video/backlight/hp680_bl.c | 4 +-
5844 drivers/video/backlight/ili9320.c | 14 +-
5845 drivers/video/backlight/ili9320.h | 2 +-
5846 drivers/video/backlight/jornada720_bl.c | 34 +-
5847 drivers/video/backlight/jornada720_lcd.c | 3 +-
5848 drivers/video/backlight/l4f00242t03.c | 3 +-
5849 drivers/video/backlight/lm3630_bl.c | 2 +-
5850 drivers/video/backlight/lms283gf05.c | 16 +-
5851 drivers/video/backlight/locomolcd.c | 65 ++-
5852 drivers/video/backlight/lp855x_bl.c | 51 +-
5853 drivers/video/backlight/omap1_bl.c | 4 +-
5854 drivers/video/backlight/pcf50633-backlight.c | 8 +-
5855 drivers/video/backlight/platform_lcd.c | 2 +-
5856 drivers/video/backlight/s6e63m0.c | 2 +-
5857 drivers/video/backlight/tdo24m.c | 33 +-
5858 drivers/video/backlight/tosa_bl.c | 10 +-
5859 drivers/video/backlight/tosa_lcd.c | 24 +-
5860 drivers/video/backlight/vgg2432a4.c | 10 +-
5862 fs/autofs4/root.c | 2 +-
5863 fs/binfmt_elf.c | 4 +-
5864 fs/block_dev.c | 9 +-
5865 fs/btrfs/disk-io.c | 8 +-
5866 fs/btrfs/file.c | 3 +-
5867 fs/btrfs/ioctl.c | 2 +-
5869 fs/debugfs/inode.c | 1 -
5870 fs/dlm/config.c | 2 +-
5871 fs/drop_caches.c | 2 +
5872 fs/fat/fat.h | 17 +-
5874 fs/fat/inode.c | 36 +-
5875 fs/fat/nfs.c | 233 ++++++++-
5876 fs/gfs2/sys.c | 18 +-
5877 fs/hfsplus/Makefile | 3 +-
5878 fs/hfsplus/attributes.c | 399 ++++++++++++++
5879 fs/hfsplus/bfind.c | 79 ++-
5880 fs/hfsplus/bnode.c | 6 +-
5881 fs/hfsplus/brec.c | 23 +-
5882 fs/hfsplus/btree.c | 8 +
5883 fs/hfsplus/catalog.c | 36 +-
5884 fs/hfsplus/dir.c | 6 +-
5885 fs/hfsplus/extents.c | 4 +-
5886 fs/hfsplus/hfsplus_fs.h | 41 +-
5887 fs/hfsplus/hfsplus_raw.h | 68 ++-
5888 fs/hfsplus/inode.c | 13 +
5889 fs/hfsplus/ioctl.c | 542 +++++++++++++++++---
5890 fs/hfsplus/super.c | 33 +-
5891 fs/hfsplus/unicode.c | 7 +-
5892 fs/ncpfs/ioctl.c | 2 +-
5893 fs/ocfs2/file.c | 5 +-
5894 fs/proc/array.c | 9 +
5895 fs/proc/base.c | 11 +-
5896 fs/proc/proc_devtree.c | 7 +-
5897 fs/proc/task_mmu.c | 53 ++
5898 fs/pstore/ram.c | 12 +-
5900 fs/udf/file.c | 2 +-
5901 include/linux/compat.h | 3 +
5902 include/linux/compiler.h | 2 +
5903 include/linux/genhd.h | 8 +-
5904 include/linux/gfp.h | 2 +-
5905 include/linux/init.h | 40 +-
5906 include/linux/ipc_namespace.h | 1 +
5907 include/linux/kernel.h | 47 +-
5908 include/linux/memory.h | 1 +
5909 include/linux/msg.h | 5 +-
5910 include/linux/oom.h | 2 -
5911 include/linux/page-isolation.h | 10 +-
5912 include/linux/platform_data/lp855x.h | 9 +-
5913 include/linux/rmap.h | 3 +
5914 include/linux/string.h | 11 +
5915 include/linux/writeback.h | 9 +-
5916 include/uapi/linux/msg.h | 1 +
5917 init/do_mounts.c | 61 ++-
5918 ipc/compat.c | 45 +-
5919 ipc/ipc_sysctl.c | 28 +
5921 ipc/msgutil.c | 38 ++
5922 ipc/sem.c | 250 ++++++---
5925 kernel/compat.c | 17 +
5926 kernel/time.c | 4 +-
5927 kernel/timeconst.pl | 2 +-
5928 kernel/trace/trace_uprobe.c | 8 +-
5929 lib/dynamic_debug.c | 9 +-
5930 lib/kstrtox.c | 64 +++
5931 lib/vsprintf.c | 8 +
5932 mm/huge_memory.c | 152 ++----
5933 mm/internal.h | 53 ++
5936 mm/memcontrol.c | 4 +-
5937 mm/memory-failure.c | 2 +-
5939 mm/memory_hotplug.c | 149 +++++-
5940 mm/migrate.c | 14 +-
5941 mm/page-writeback.c | 11 +-
5942 mm/page_alloc.c | 102 +++-
5943 mm/page_cgroup.c | 3 +
5944 mm/page_isolation.c | 27 +-
5949 mm/slab_common.c | 7 +
5952 mm/swap_state.c | 6 +
5955 scripts/checkpatch.pl | 6 +-
5956 scripts/pnmtologo.c | 9 +
5957 scripts/tags.sh | 41 +-
5958 security/selinux/netnode.c | 3 +-
5959 tools/testing/selftests/ipc/Makefile | 25 +
5960 tools/testing/selftests/ipc/msgque.c | 231 +++++++++
5961 tools/testing/selftests/kcmp/kcmp_test.c | 6 +-
5962 181 files changed, 3756 insertions(+), 1126 deletions(-)
5963 create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
5964 create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
5965 create mode 100644 fs/hfsplus/attributes.c
5966 create mode 100644 tools/testing/selftests/ipc/Makefile
5967 create mode 100644 tools/testing/selftests/ipc/msgque.c
projects / karo-tx-linux.git / blob