| blob | 5a5027eb2b032dc8870641ec1fcb755327430bc9 |
1 $ git checkout master
2 Already on 'master'
3 $ git reset --hard stable
4 HEAD is now at d93a8f8 Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier"
5 Merging origin/master
6 $ git merge origin/master
7 Updating d93a8f8..2caa731
8 Fast forward
9 MAINTAINERS | 5 +
10 arch/arm/include/asm/bitops.h | 6 +-
11 arch/arm/kernel/traps.c | 76 ++++++-----
12 arch/arm/mach-bcmring/core.c | 4 +-
13 arch/arm/mach-bcmring/include/mach/system.h | 2 +-
14 arch/arm/mach-ep93xx/Kconfig | 44 +++++--
15 arch/arm/mach-ep93xx/Makefile.boot | 9 ++
16 arch/arm/mach-ep93xx/clock.c | 166 ++++++++++++++++-------
17 arch/arm/mach-ep93xx/core.c | 31 +++-
18 arch/arm/mach-ep93xx/edb93xx.c | 31 ++++-
19 arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 42 +++---
20 arch/arm/mach-ep93xx/include/mach/gpio.h | 16 +--
21 arch/arm/mach-ep93xx/include/mach/memory.h | 6 +
22 arch/arm/mach-ep93xx/include/mach/platform.h | 4 +-
23 arch/arm/mach-ep93xx/micro9.c | 132 +++++++++++--------
24 arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +-
25 arch/arm/mach-pxa/csb726.c | 2 +-
26 arch/arm/mach-sa1100/Makefile | 1 +
27 arch/arm/mm/cache-v6.S | 20 +++-
28 arch/arm/mm/cache-v7.S | 19 +++-
29 arch/arm/mm/fault-armv.c | 9 +-
30 arch/arm/mm/fault.c | 5 +
31 arch/arm/mm/highmem.c | 2 +
32 arch/arm/mm/init.c | 2 +-
33 drivers/mmc/host/pxamci.c | 4 +-
34 drivers/pci/pci.c | 14 ++-
35 drivers/pci/pcie/aer/aerdrv.c | 2 +-
36 drivers/pci/pcie/portdrv_pci.c | 3 +-
37 drivers/pci/quirks.c | 19 +++
38 drivers/pci/setup-bus.c | 13 ++-
39 drivers/pci/setup-res.c | 37 -----
40 drivers/serial/serial_core.c | 7 +-
41 drivers/spi/amba-pl022.c | 2 +-
42 drivers/usb/musb/Kconfig | 2 +-
43 fs/nfs/super.c | 4 +-
44 include/linux/pci_ids.h | 1 +
45 36 files changed, 476 insertions(+), 268 deletions(-)
46 Merging fixes/fixes
47 $ git merge fixes/fixes
48 Merge made by recursive.
49 arch/powerpc/kvm/timing.h | 2 +-
50 1 files changed, 1 insertions(+), 1 deletions(-)
51 Merging arm-current/master
52 $ git merge arm-current/master
53 Already up-to-date.
54 Merging m68k-current/for-linus
55 $ git merge m68k-current/for-linus
56 Already up-to-date.
57 Merging powerpc-merge/merge
58 $ git merge powerpc-merge/merge
59 Already up-to-date.
60 Merging sparc-current/master
61 $ git merge sparc-current/master
62 Merge made by recursive.
63 arch/sparc/kernel/perf_event.c | 2 +-
64 1 files changed, 1 insertions(+), 1 deletions(-)
65 Merging scsi-rc-fixes/master
66 $ git merge scsi-rc-fixes/master
67 Already up-to-date.
68 Merging net-current/master
69 $ git merge net-current/master
70 Auto-merging drivers/net/wireless/b43/pio.c
71 Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c
72 Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c
73 Merge made by recursive.
74 drivers/net/Makefile | 8 +-
75 drivers/net/ibm_newemac/core.c | 7 +-
76 drivers/net/ibm_newemac/emac.h | 1 +
77 drivers/net/qlge/qlge.h | 10 ++-
78 drivers/net/qlge/qlge_main.c | 97 ++++++++++++----
79 drivers/net/qlge/qlge_mpi.c | 93 +++++++++++++++
80 drivers/net/wireless/adm8211.h | 2 +-
81 drivers/net/wireless/b43/b43.h | 168 +++++++++++++++------------
82 drivers/net/wireless/b43/leds.c | 4 +-
83 drivers/net/wireless/b43/leds.h | 4 +-
84 drivers/net/wireless/b43/main.c | 7 +-
85 drivers/net/wireless/b43/pio.c | 78 ++++++------
86 drivers/net/wireless/b43/xmit.c | 2 +-
87 drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +-
88 drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +-
89 drivers/net/wireless/iwlwifi/iwl-5000.c | 2 +-
90 drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +-
91 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 23 ++--
92 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 20 ++--
93 drivers/net/wireless/iwlwifi/iwl-rx.c | 2 +-
94 drivers/net/znet.c | 8 --
95 include/linux/netdevice.h | 2 +-
96 net/mac80211/rx.c | 10 ++-
97 net/mac80211/sta_info.c | 2 +
98 net/mac80211/tx.c | 3 +-
99 net/mac80211/util.c | 4 +-
100 net/sched/cls_api.c | 2 +-
101 net/wireless/nl80211.c | 3 +-
102 28 files changed, 373 insertions(+), 195 deletions(-)
103 Merging sound-current/for-linus
104 $ git merge sound-current/for-linus
105 Already up-to-date.
106 Merging pci-current/for-linus
107 $ git merge pci-current/for-linus
108 Already up-to-date.
109 Merging wireless-current/master
110 $ git merge wireless-current/master
111 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
112 Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c
113 Merge made by recursive.
114 drivers/net/wireless/b43/xmit.c | 3 +++
115 drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
116 drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
117 drivers/net/wireless/libertas/cmdresp.c | 1 +
118 include/net/mac80211.h | 2 ++
119 net/mac80211/ibss.c | 4 ++--
120 net/mac80211/rx.c | 2 ++
121 7 files changed, 12 insertions(+), 4 deletions(-)
122 Merging kbuild-current/master
123 $ git merge kbuild-current/master
124 Auto-merging Makefile
125 Merge made by recursive.
126 Makefile | 46 +--------------------------------------
127 include/linux/kernel.h | 6 +++++
128 scripts/Kbuild.include | 2 +-
129 scripts/Makefile.lib | 2 +-
130 scripts/checkkconfigsymbols.sh | 4 +-
131 scripts/headers_install.pl | 2 +-
132 scripts/mkcompile_h | 12 +++++++--
133 scripts/package/Makefile | 11 ++++++++-
134 scripts/package/mkspec | 2 +-
135 9 files changed, 33 insertions(+), 54 deletions(-)
136 Merging quilt/driver-core.current
137 $ git merge quilt/driver-core.current
138 Merge made by recursive.
139 fs/sysfs/dir.c | 3 ++-
140 fs/sysfs/file.c | 14 ++++++++------
141 2 files changed, 10 insertions(+), 7 deletions(-)
142 Merging quilt/tty.current
143 $ git merge quilt/tty.current
144 Merge made by recursive.
145 drivers/char/vt_ioctl.c | 2 +-
146 1 files changed, 1 insertions(+), 1 deletions(-)
147 Merging quilt/usb.current
148 $ git merge quilt/usb.current
149 Merge made by recursive.
150 ...fs-class-usb_host => sysfs-class-uwb_rc-wusbhc} | 4 +-
151 drivers/usb/host/ehci-sched.c | 12 +++---
152 drivers/usb/host/whci/asl.c | 23 ++++++++---
153 drivers/usb/host/whci/pzl.c | 24 ++++++++---
154 drivers/usb/serial/option.c | 4 ++
155 drivers/usb/wusbcore/security.c | 41 +++++++++----------
156 6 files changed, 64 insertions(+), 44 deletions(-)
157 rename Documentation/ABI/testing/{sysfs-class-usb_host => sysfs-class-uwb_rc-wusbhc} (88%)
158 Merging quilt/staging.current
159 $ git merge quilt/staging.current
160 Merge made by recursive.
161 drivers/staging/b3dfg/b3dfg.c | 1 +
162 drivers/staging/comedi/drivers/me_daq.c | 1 +
163 drivers/staging/comedi/drivers/ni_mio_common.c | 1 +
164 drivers/staging/comedi/drivers/ni_pcidio.c | 1 +
165 drivers/staging/et131x/et1310_address_map.h | 2 +-
166 drivers/staging/et131x/et1310_rx.c | 20 ++++++++++++++------
167 drivers/staging/hv/osd.c | 1 +
168 drivers/staging/iio/industrialio-core.c | 2 ++
169 drivers/staging/poch/poch.c | 1 +
170 drivers/staging/sep/sep_driver.c | 1 +
171 drivers/staging/vme/bridges/vme_ca91cx42.c | 1 +
172 drivers/staging/vme/bridges/vme_tsi148.c | 1 +
173 12 files changed, 26 insertions(+), 7 deletions(-)
174 Merging cpufreq-current/fixes
175 $ git merge cpufreq-current/fixes
176 Already up-to-date.
177 Merging input-current/for-linus
178 $ git merge input-current/for-linus
179 Already up-to-date.
180 Merging md-current/for-linus
181 $ git merge md-current/for-linus
182 Already up-to-date.
183 Merging audit-current/for-linus
184 $ git merge audit-current/for-linus
185 Already up-to-date.
186 Merging crypto-current/master
187 $ git merge crypto-current/master
188 Merge made by recursive.
189 drivers/crypto/padlock-sha.c | 14 ++++++++++++--
190 1 files changed, 12 insertions(+), 2 deletions(-)
191 Merging ide-curent/master
192 $ git merge ide-curent/master
193 Already up-to-date.
194 Merging dwmw2/master
195 $ git merge dwmw2/master
196 Already up-to-date.
197 Merging arm/devel
198 $ git merge arm/devel
199 Already up-to-date.
200 Merging davinci/for-next
201 $ git merge davinci/for-next
202 Removing arch/arm/configs/da830_omapl137_defconfig
203 Merge made by recursive.
204 arch/arm/configs/da830_omapl137_defconfig | 1254 --------------------
205 ...50_omapl138_defconfig => da8xx_omapl_defconfig} | 174 ++--
206 arch/arm/configs/davinci_all_defconfig | 125 ++-
207 arch/arm/mach-davinci/Kconfig | 54 +
208 arch/arm/mach-davinci/Makefile | 3 +
209 arch/arm/mach-davinci/board-da830-evm.c | 234 ++++-
210 arch/arm/mach-davinci/board-da850-evm.c | 366 ++++++-
211 arch/arm/mach-davinci/board-dm355-evm.c | 12 +-
212 arch/arm/mach-davinci/board-dm355-leopard.c | 9 +-
213 arch/arm/mach-davinci/board-dm365-evm.c | 18 +-
214 arch/arm/mach-davinci/board-dm644x-evm.c | 12 -
215 arch/arm/mach-davinci/board-dm646x-evm.c | 84 ++-
216 arch/arm/mach-davinci/board-sffsdr.c | 12 -
217 arch/arm/mach-davinci/clock.c | 227 +++-
218 arch/arm/mach-davinci/clock.h | 17 +-
219 arch/arm/mach-davinci/common.c | 4 +-
220 arch/arm/mach-davinci/cp_intc.c | 3 -
221 arch/arm/mach-davinci/cpufreq.c | 219 ++++
222 arch/arm/mach-davinci/da830.c | 75 +-
223 arch/arm/mach-davinci/da850.c | 300 +++++-
224 arch/arm/mach-davinci/devices-da8xx.c | 76 +-
225 arch/arm/mach-davinci/devices.c | 6 +-
226 arch/arm/mach-davinci/dm355.c | 2 -
227 arch/arm/mach-davinci/dm365.c | 49 +-
228 arch/arm/mach-davinci/dm644x.c | 2 -
229 arch/arm/mach-davinci/dm646x.c | 11 +-
230 arch/arm/mach-davinci/dma.c | 105 +-
231 arch/arm/mach-davinci/gpio.c | 9 -
232 arch/arm/mach-davinci/include/mach/asp.h | 3 +
233 arch/arm/mach-davinci/include/mach/cpufreq.h | 25 +
234 arch/arm/mach-davinci/include/mach/da8xx.h | 23 +-
235 arch/arm/mach-davinci/include/mach/dm365.h | 2 +
236 arch/arm/mach-davinci/include/mach/dm644x.h | 1 -
237 arch/arm/mach-davinci/include/mach/mux.h | 11 +-
238 arch/arm/mach-davinci/include/mach/system.h | 3 +-
239 arch/arm/mach-davinci/include/mach/usb.h | 57 +
240 arch/arm/mach-davinci/mux.c | 1 -
241 arch/arm/mach-davinci/psc.c | 3 -
242 arch/arm/mach-davinci/serial.c | 6 -
243 arch/arm/mach-davinci/sram.c | 3 -
244 arch/arm/mach-davinci/time.c | 6 -
245 arch/arm/mach-davinci/usb.c | 41 +-
246 42 files changed, 1965 insertions(+), 1682 deletions(-)
247 delete mode 100644 arch/arm/configs/da830_omapl137_defconfig
248 rename arch/arm/configs/{da850_omapl138_defconfig => da8xx_omapl_defconfig} (92%)
249 create mode 100644 arch/arm/mach-davinci/cpufreq.c
250 create mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h
251 create mode 100644 arch/arm/mach-davinci/include/mach/usb.h
252 Merging pxa/for-next
253 $ git merge pxa/for-next
254 Removing arch/arm/mach-pxa/include/mach/treo680.h
255 Merge made by recursive.
256 arch/arm/mach-pxa/Kconfig | 572 ++++++++++++++-------------
257 arch/arm/mach-pxa/Makefile | 93 +++---
258 arch/arm/mach-pxa/include/mach/palmtreo.h | 67 ++++
259 arch/arm/mach-pxa/include/mach/treo680.h | 49 ---
260 arch/arm/mach-pxa/{treo680.c => palmtreo.c} | 361 +++++++++++++----
261 arch/arm/mm/mmu.c | 2 +-
262 drivers/mmc/host/pxamci.c | 10 +-
263 7 files changed, 695 insertions(+), 459 deletions(-)
264 create mode 100644 arch/arm/mach-pxa/include/mach/palmtreo.h
265 delete mode 100644 arch/arm/mach-pxa/include/mach/treo680.h
266 rename arch/arm/mach-pxa/{treo680.c => palmtreo.c} (54%)
267 Merging avr32/avr32-arch
268 $ git merge avr32/avr32-arch
269 Merge made by recursive.
270 arch/avr32/boards/atngw100/mrmt.c | 1 +
271 arch/avr32/boards/atngw100/setup.c | 5 --
272 arch/avr32/kernel/vmlinux.lds.S | 64 ++++-----------------------
273 arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++-------
274 arch/avr32/mach-at32ap/include/mach/board.h | 1 +
275 arch/avr32/mach-at32ap/include/mach/cpu.h | 2 +
276 6 files changed, 32 insertions(+), 76 deletions(-)
277 Merging blackfin/for-linus
278 $ git merge blackfin/for-linus
279 Already up-to-date.
280 Merging cris/for-next
281 $ git merge cris/for-next
282 Already up-to-date.
283 Merging ia64/test
284 $ git merge ia64/test
285 Already up-to-date.
286 Merging m68k/for-next
287 $ git merge m68k/for-next
288 Resolved 'drivers/rtc/Kconfig' using previous resolution.
289 Auto-merging drivers/rtc/Kconfig
290 CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
291 Auto-merging drivers/rtc/Makefile
292 Automatic merge failed; fix conflicts and then commit the result.
293 $ git commit -v -a
294 [master 36e9ac1] Merge remote branch 'm68k/for-next'
295 $ git diff -M --stat --summary HEAD^..
296 drivers/rtc/Kconfig | 19 +++
297 drivers/rtc/Makefile | 2 +
298 drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++
299 drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++
300 4 files changed, 511 insertions(+), 0 deletions(-)
301 create mode 100644 drivers/rtc/rtc-msm6242.c
302 create mode 100644 drivers/rtc/rtc-rp5c01.c
303 Merging m68knommu/for-next
304 $ git merge m68knommu/for-next
305 Merge made by recursive.
306 arch/m68k/include/asm/processor.h | 2 ++
307 arch/m68k/include/asm/ptrace.h | 12 ++++++++++++
308 arch/m68knommu/kernel/ptrace.c | 18 +++++++++++++++---
309 3 files changed, 29 insertions(+), 3 deletions(-)
310 Merging microblaze/next
311 $ git merge microblaze/next
312 Already up-to-date.
313 Merging mips/mips-for-linux-next
314 $ git merge mips/mips-for-linux-next
315 Already up-to-date.
316 Merging parisc/next
317 $ git merge parisc/next
318 Already up-to-date.
319 Merging powerpc/next
320 $ git merge powerpc/next
321 Already up-to-date.
322 Merging 4xx/next
323 $ git merge 4xx/next
324 Already up-to-date.
325 Merging galak/next
326 $ git merge galak/next
327 Already up-to-date.
328 Merging s390/features
329 $ git merge s390/features
330 Merge made by recursive.
331 arch/s390/Kconfig | 15 --
332 arch/s390/defconfig | 1 -
333 arch/s390/hypfs/hypfs_diag.c | 2 +-
334 arch/s390/include/asm/mmu_context.h | 4 +-
335 arch/s390/include/asm/pgalloc.h | 3 +-
336 arch/s390/include/asm/setup.h | 17 +-
337 arch/s390/include/asm/uaccess.h | 2 +
338 arch/s390/kernel/processor.c | 6 +-
339 arch/s390/kernel/setup.c | 36 ++--
340 arch/s390/kernel/vdso.c | 9 +-
341 arch/s390/kvm/Kconfig | 1 -
342 arch/s390/lib/uaccess_mvcos.c | 4 -
343 arch/s390/lib/uaccess_pt.c | 147 +++++---------
344 arch/s390/mm/fault.c | 379 ++++++++++++++++++-----------------
345 arch/s390/mm/pgtable.c | 2 +-
346 drivers/s390/block/dasd_eckd.c | 8 +-
347 drivers/s390/char/tape_block.c | 3 +-
348 17 files changed, 291 insertions(+), 348 deletions(-)
349 Merging sh/master
350 $ git merge sh/master
351 Removing arch/sh/mm/pmb-fixed.c
352 Merge made by recursive.
353 arch/sh/boards/mach-kfr2r09/setup.c | 139 ++++++++++
354 arch/sh/boot/compressed/misc.c | 2 +-
355 arch/sh/include/asm/addrspace.h | 9 +-
356 arch/sh/include/asm/dwarf.h | 16 +
357 arch/sh/include/asm/fixmap.h | 6 +-
358 arch/sh/include/asm/io.h | 4 +-
359 arch/sh/include/asm/mmu.h | 13 +-
360 arch/sh/include/asm/pgtable.h | 26 ++-
361 arch/sh/include/asm/pgtable_32.h | 2 +-
362 arch/sh/include/asm/scatterlist.h | 2 +-
363 arch/sh/kernel/cpu/sh4a/setup-shx3.c | 28 ++-
364 arch/sh/kernel/dwarf.c | 185 +++++++++----
365 arch/sh/kernel/head_32.S | 2 +-
366 arch/sh/kernel/machine_kexec.c | 2 +-
367 arch/sh/kernel/module.c | 32 +++
368 arch/sh/kernel/setup.c | 4 +
369 arch/sh/mm/Kconfig | 2 -
370 arch/sh/mm/Makefile | 3 +-
371 arch/sh/mm/cache-sh4.c | 504 ++++++----------------------------
372 arch/sh/mm/cache-sh7705.c | 2 +-
373 arch/sh/mm/cache.c | 6 +
374 arch/sh/mm/consistent.c | 2 +-
375 arch/sh/mm/init.c | 8 +
376 arch/sh/mm/kmap.c | 4 +-
377 arch/sh/mm/pmb-fixed.c | 45 ---
378 arch/sh/mm/pmb.c | 268 +++++++++---------
379 26 files changed, 620 insertions(+), 696 deletions(-)
380 delete mode 100644 arch/sh/mm/pmb-fixed.c
381 Merging sparc/master
382 $ git merge sparc/master
383 Already up-to-date.
384 Merging xtensa/master
385 $ git merge xtensa/master
386 Auto-merging arch/xtensa/Kconfig
387 Merge made by recursive.
388 Merging cifs/master
389 $ git merge cifs/master
390 Merge made by recursive.
391 fs/cifs/connect.c | 3 ++-
392 1 files changed, 2 insertions(+), 1 deletions(-)
393 Merging configfs/linux-next
394 $ git merge configfs/linux-next
395 Already up-to-date.
396 Merging ecryptfs/next
397 $ git merge ecryptfs/next
398 Resolved 'fs/ecryptfs/Kconfig' using previous resolution.
399 Auto-merging fs/ecryptfs/Kconfig
400 CONFLICT (content): Merge conflict in fs/ecryptfs/Kconfig
401 Automatic merge failed; fix conflicts and then commit the result.
402 $ git commit -v -a
403 [master 4b270ba] Merge remote branch 'ecryptfs/next'
404 $ git diff -M --stat --summary HEAD^..
405 Merging ext3/for_next
406 $ git merge ext3/for_next
407 Merge made by recursive.
408 Documentation/filesystems/ext3.txt | 16 +-
409 fs/ext3/super.c | 13 +-
410 fs/isofs/compress.c | 533 +++++++++++++++++++-----------------
411 fs/isofs/rock.c | 3 +-
412 4 files changed, 310 insertions(+), 255 deletions(-)
413 Merging ext4/next
414 $ git merge ext4/next
415 Already up-to-date.
416 Merging fatfs/master
417 $ git merge fatfs/master
418 Already up-to-date.
419 Merging fuse/for-next
420 $ git merge fuse/for-next
421 Already up-to-date.
422 Merging gfs2/master
423 $ git merge gfs2/master
424 Merge made by recursive.
425 fs/gfs2/Kconfig | 2 +
426 fs/gfs2/acl.c | 357 +++++++++++--------
427 fs/gfs2/acl.h | 24 +-
428 fs/gfs2/bmap.c | 2 +-
429 fs/gfs2/glock.c | 13 +-
430 fs/gfs2/glock.h | 9 -
431 fs/gfs2/glops.c | 5 +-
432 fs/gfs2/inode.c | 2 +-
433 fs/gfs2/log.c | 2 +-
434 fs/gfs2/lops.c | 2 +-
435 fs/gfs2/ops_fstype.c | 140 +++++++-
436 fs/gfs2/quota.c | 362 +++++++++++++++-----
437 fs/gfs2/quota.h | 3 +-
438 fs/gfs2/rgrp.c | 2 +-
439 fs/gfs2/super.c | 23 +-
440 fs/gfs2/super.h | 4 +-
441 fs/gfs2/sys.c | 14 +-
442 fs/gfs2/xattr.c | 74 +++--
443 fs/gfs2/xattr.h | 8 +-
444 fs/xattr_acl.c | 2 +-
445 include/linux/posix_acl.h | 14 +
446 .../trace_gfs2.h => include/trace/events/gfs2.h | 7 +-
447 22 files changed, 718 insertions(+), 353 deletions(-)
448 rename fs/gfs2/trace_gfs2.h => include/trace/events/gfs2.h (98%)
449 Merging jfs/next
450 $ git merge jfs/next
451 Already up-to-date.
452 Merging nfs/linux-next
453 $ git merge nfs/linux-next
454 Already up-to-date.
455 Merging nfsd/nfsd-next
456 $ git merge nfsd/nfsd-next
457 Merge made by recursive.
458 Documentation/filesystems/nfs41-server.txt | 9 ++++-
459 fs/nfsd/export.c | 22 ++++++++--
460 fs/nfsd/nfs4state.c | 3 +-
461 fs/nfsd/nfsproc.c | 1 +
462 fs/nfsd/vfs.c | 62 ++++++++++++++++-----------
463 5 files changed, 66 insertions(+), 31 deletions(-)
464 Merging nilfs2/for-next
465 $ git merge nilfs2/for-next
466 Already up-to-date.
467 Merging ocfs2/linux-next
468 $ git merge ocfs2/linux-next
469 Already up-to-date.
470 Merging squashfs/master
471 $ git merge squashfs/master
472 Already up-to-date.
473 Merging udf/for_next
474 $ git merge udf/for_next
475 Already up-to-date.
476 Merging v9fs/for-next
477 $ git merge v9fs/for-next
478 Merge made by recursive.
479 Merging ubifs/linux-next
480 $ git merge ubifs/linux-next
481 Already up-to-date.
482 Merging xfs/master
483 $ git merge xfs/master
484 Already up-to-date.
485 Merging reiserfs-bkl/reiserfs/kill-bkl
486 $ git merge reiserfs-bkl/reiserfs/kill-bkl
487 Auto-merging fs/reiserfs/super.c
488 Merge made by recursive.
489 fs/reiserfs/Makefile | 2 +-
490 fs/reiserfs/bitmap.c | 4 +
491 fs/reiserfs/dir.c | 8 +++
492 fs/reiserfs/do_balan.c | 17 ++----
493 fs/reiserfs/fix_node.c | 19 +++++-
494 fs/reiserfs/inode.c | 84 ++++++++++++++++----------
495 fs/reiserfs/ioctl.c | 6 +-
496 fs/reiserfs/journal.c | 130 ++++++++++++++++++++++++++++++----------
497 fs/reiserfs/lock.c | 88 +++++++++++++++++++++++++++
498 fs/reiserfs/namei.c | 20 ++++--
499 fs/reiserfs/prints.c | 4 -
500 fs/reiserfs/resize.c | 2 +
501 fs/reiserfs/stree.c | 53 ++++++++++++++---
502 fs/reiserfs/super.c | 52 ++++++++++++----
503 fs/reiserfs/xattr.c | 6 +-
504 include/linux/reiserfs_fs.h | 68 +++++++++++++++++++--
505 include/linux/reiserfs_fs_sb.h | 20 ++++++
506 17 files changed, 458 insertions(+), 125 deletions(-)
507 create mode 100644 fs/reiserfs/lock.c
508 Merging vfs/for-next
509 $ git merge vfs/for-next
510 Already up-to-date.
511 Merging pci/linux-next
512 $ git merge pci/linux-next
513 Merge made by recursive.
514 arch/ia64/pci/pci.c | 9 +---
515 arch/sparc/include/asm/pci_64.h | 2 -
516 arch/sparc/kernel/pci.c | 7 +++
517 arch/x86/pci/Makefile | 1 +
518 arch/x86/pci/amd_bus.c | 45 ++++++++------------
519 arch/x86/pci/bus_numa.h | 26 +++++++++++
520 arch/x86/pci/common.c | 8 +--
521 arch/x86/pci/intel_bus.c | 90 +++++++++++++++++++++++++++++++++++++++
522 drivers/pci/pci.c | 85 ++++++++++++++++++++++++------------
523 drivers/pcmcia/cardbus.c | 23 ++++++---
524 include/linux/pci.h | 3 +
525 11 files changed, 223 insertions(+), 76 deletions(-)
526 create mode 100644 arch/x86/pci/bus_numa.h
527 create mode 100644 arch/x86/pci/intel_bus.c
528 Merging hid/for-next
529 $ git merge hid/for-next
530 Auto-merging drivers/hid/hidraw.c
531 Merge made by recursive.
532 drivers/hid/hid-core.c | 8 +++++---
533 drivers/hid/hid-twinhan.c | 4 ++--
534 drivers/hid/hidraw.c | 5 ++---
535 drivers/hid/usbhid/hid-core.c | 9 ++++-----
536 4 files changed, 13 insertions(+), 13 deletions(-)
537 Merging quilt/i2c
538 $ git merge quilt/i2c
539 Removing Documentation/i2c/busses/i2c-voodoo3
540 Removing drivers/i2c/busses/i2c-voodoo3.c
541 Auto-merging include/linux/pci_ids.h
542 Merge made by recursive.
543 Documentation/feature-removal-schedule.txt | 9 -
544 Documentation/i2c/busses/i2c-piix4 | 2 +-
545 Documentation/i2c/busses/i2c-voodoo3 | 62 -------
546 Documentation/i2c/old-module-parameters | 44 +++++
547 drivers/i2c/Kconfig | 1 +
548 drivers/i2c/busses/Kconfig | 18 +--
549 drivers/i2c/busses/Makefile | 3 -
550 drivers/i2c/busses/i2c-ali1535.c | 2 +-
551 drivers/i2c/busses/i2c-ali15x3.c | 2 +-
552 drivers/i2c/busses/i2c-iop3xx.c | 6 -
553 drivers/i2c/busses/i2c-mv64xxx.c | 3 -
554 drivers/i2c/busses/i2c-piix4.c | 4 +-
555 drivers/i2c/busses/i2c-powermac.c | 115 ++++++++------
556 drivers/i2c/busses/i2c-sis5595.c | 2 +-
557 drivers/i2c/busses/i2c-sis630.c | 2 +-
558 drivers/i2c/busses/i2c-voodoo3.c | 248 ----------------------------
559 drivers/i2c/chips/Kconfig | 10 -
560 drivers/i2c/chips/Makefile | 1 -
561 drivers/i2c/i2c-core.c | 99 ++---------
562 drivers/i2c/i2c-dev.c | 22 +--
563 drivers/misc/Kconfig | 10 +
564 drivers/misc/Makefile | 1 +
565 drivers/{i2c/chips => misc}/ds1682.c | 0
566 drivers/misc/ics932s401.c | 37 ++---
567 drivers/net/sfc/sfe4001.c | 4 +-
568 include/linux/i2c.h | 94 +----------
569 include/linux/pci_ids.h | 2 +-
570 27 files changed, 173 insertions(+), 630 deletions(-)
571 delete mode 100644 Documentation/i2c/busses/i2c-voodoo3
572 create mode 100644 Documentation/i2c/old-module-parameters
573 delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c
574 rename drivers/{i2c/chips => misc}/ds1682.c (100%)
575 Merging quilt/jdelvare-hwmon
576 $ git merge quilt/jdelvare-hwmon
577 Merge made by recursive.
578 Documentation/hwmon/mc13783-adc | 50 +++++++++
579 Documentation/hwmon/w83627hf | 29 +++++-
580 drivers/hwmon/Kconfig | 17 +++-
581 drivers/hwmon/Makefile | 2 +
582 drivers/hwmon/adm1021.c | 76 +++++---------
583 drivers/hwmon/adm1025.c | 73 ++++---------
584 drivers/hwmon/adm1026.c | 47 ++++-----
585 drivers/hwmon/adm1029.c | 57 +++-------
586 drivers/hwmon/adm1031.c | 26 ++----
587 drivers/hwmon/adm9240.c | 61 ++++-------
588 drivers/hwmon/ads7828.c | 22 ++--
589 drivers/hwmon/adt7462.c | 25 ++---
590 drivers/hwmon/adt7470.c | 25 ++---
591 drivers/hwmon/adt7473.c | 25 ++---
592 drivers/hwmon/adt7475.c | 14 +--
593 drivers/hwmon/asb100.c | 55 +++-------
594 drivers/hwmon/dme1737.c | 32 ++----
595 drivers/hwmon/ds1621.c | 22 ++---
596 drivers/hwmon/f75375s.c | 31 ++----
597 drivers/hwmon/fschmd.c | 53 ++++-----
598 drivers/hwmon/gl518sm.c | 29 ++----
599 drivers/hwmon/gl520sm.c | 12 +--
600 drivers/hwmon/lm63.c | 54 ++++-----
601 drivers/hwmon/lm73.c | 205 +++++++++++++++++++++++++++++++++++
602 drivers/hwmon/lm75.c | 56 +++++-----
603 drivers/hwmon/lm77.c | 80 +++++++-------
604 drivers/hwmon/lm78.c | 60 ++++-------
605 drivers/hwmon/lm83.c | 81 +++++----------
606 drivers/hwmon/lm85.c | 157 +++++++++++----------------
607 drivers/hwmon/lm87.c | 41 +++----
608 drivers/hwmon/lm90.c | 228 ++++++++++++++++----------------------
609 drivers/hwmon/lm92.c | 31 ++----
610 drivers/hwmon/lm93.c | 32 ++----
611 drivers/hwmon/lm95241.c | 48 ++-------
612 drivers/hwmon/max1619.c | 64 ++++--------
613 drivers/hwmon/max6650.c | 20 +---
614 drivers/hwmon/mc13783-adc.c | 224 ++++++++++++++++++++++++++++++++++++++
615 drivers/hwmon/smsc47m192.c | 28 +++---
616 drivers/hwmon/thmc50.c | 37 +++----
617 drivers/hwmon/tmp401.c | 55 +++++-----
618 drivers/hwmon/tmp421.c | 45 ++++----
619 drivers/hwmon/w83627hf.c | 96 +++++++---------
620 drivers/hwmon/w83781d.c | 131 +++++++++-------------
621 drivers/hwmon/w83791d.c | 60 +++-------
622 drivers/hwmon/w83792d.c | 61 +++--------
623 drivers/hwmon/w83793.c | 53 +++------
624 drivers/hwmon/w83l785ts.c | 70 ++++--------
625 drivers/hwmon/w83l786ng.c | 58 +++-------
626 48 files changed, 1396 insertions(+), 1462 deletions(-)
627 create mode 100644 Documentation/hwmon/mc13783-adc
628 create mode 100644 drivers/hwmon/lm73.c
629 create mode 100644 drivers/hwmon/mc13783-adc.c
630 Merging quilt/kernel-doc
631 $ git merge quilt/kernel-doc
632 Already up-to-date.
633 Merging v4l-dvb/master
634 $ git merge v4l-dvb/master
635 Merge made by recursive.
636 drivers/media/common/tuners/tuner-xc2028.c | 20 +-
637 drivers/media/common/tuners/tuner-xc2028.h | 2 +
638 drivers/staging/tm6000/Kconfig | 32 +
639 drivers/staging/tm6000/Makefile | 15 +
640 drivers/staging/tm6000/README | 11 +
641 drivers/staging/tm6000/hack.c | 252 +++++
642 drivers/staging/tm6000/hack.h | 45 +
643 drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++++
644 drivers/staging/tm6000/tm6000-cards.c | 630 +++++++++++
645 drivers/staging/tm6000/tm6000-core.c | 511 +++++++++
646 drivers/staging/tm6000/tm6000-dvb.c | 322 ++++++
647 drivers/staging/tm6000/tm6000-i2c.c | 245 +++++
648 drivers/staging/tm6000/tm6000-regs.h | 86 ++
649 drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++++
650 drivers/staging/tm6000/tm6000-usb-isoc.h | 53 +
651 drivers/staging/tm6000/tm6000-video.c | 1573 ++++++++++++++++++++++++++++
652 drivers/staging/tm6000/tm6000.h | 279 +++++
653 include/linux/videodev2.h | 1 +
654 18 files changed, 5360 insertions(+), 3 deletions(-)
655 create mode 100644 drivers/staging/tm6000/Kconfig
656 create mode 100644 drivers/staging/tm6000/Makefile
657 create mode 100644 drivers/staging/tm6000/README
658 create mode 100644 drivers/staging/tm6000/hack.c
659 create mode 100644 drivers/staging/tm6000/hack.h
660 create mode 100644 drivers/staging/tm6000/tm6000-alsa.c
661 create mode 100644 drivers/staging/tm6000/tm6000-cards.c
662 create mode 100644 drivers/staging/tm6000/tm6000-core.c
663 create mode 100644 drivers/staging/tm6000/tm6000-dvb.c
664 create mode 100644 drivers/staging/tm6000/tm6000-i2c.c
665 create mode 100644 drivers/staging/tm6000/tm6000-regs.h
666 create mode 100644 drivers/staging/tm6000/tm6000-stds.c
667 create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h
668 create mode 100644 drivers/staging/tm6000/tm6000-video.c
669 create mode 100644 drivers/staging/tm6000/tm6000.h
670 Merging quota/for_next
671 $ git merge quota/for_next
672 Already up-to-date.
673 Merging kbuild/master
674 $ git merge kbuild/master
675 Auto-merging Makefile
676 Removing arch/sh/include/asm/.gitignore
677 Auto-merging kernel/trace/trace.c
678 Auto-merging scripts/mkcompile_h
679 Merge made by recursive.
680 .gitignore | 6 --
681 Documentation/kbuild/kconfig.txt | 3 +-
682 Kbuild | 4 +-
683 Makefile | 68 ++++------------------
684 arch/alpha/boot/bootp.c | 2 +-
685 arch/alpha/boot/bootpz.c | 2 +-
686 arch/alpha/boot/main.c | 2 +-
687 arch/alpha/include/asm/asm-offsets.h | 1 +
688 arch/arm/Makefile | 14 +----
689 arch/arm/include/asm/asm-offsets.h | 1 +
690 arch/arm/include/asm/mach-types.h | 1 +
691 arch/arm/tools/Makefile | 2 +-
692 arch/arm/tools/gen-mach-types | 2 +-
693 arch/avr32/include/asm/asm-offsets.h | 1 +
694 arch/blackfin/include/asm/asm-offsets.h | 1 +
695 arch/cris/arch-v32/kernel/head.S | 1 -
696 arch/cris/include/asm/asm-offsets.h | 1 +
697 arch/cris/kernel/asm-offsets.c | 1 -
698 arch/cris/kernel/vmlinux.lds.S | 1 -
699 arch/frv/include/asm/asm-offsets.h | 1 +
700 arch/frv/kernel/setup.c | 2 +-
701 arch/h8300/include/asm/asm-offsets.h | 1 +
702 arch/ia64/Makefile | 2 +-
703 arch/ia64/include/asm/asm-offsets.h | 1 +
704 arch/ia64/include/asm/irq.h | 2 +-
705 arch/ia64/kernel/Makefile | 7 +--
706 arch/ia64/kvm/asm-offsets.c | 1 -
707 arch/m68k/include/asm/asm-offsets.h | 1 +
708 arch/m68k/kernel/head.S | 2 +-
709 arch/microblaze/include/asm/asm-offsets.h | 1 +
710 arch/mips/include/asm/asm-offsets.h | 1 +
711 arch/mn10300/include/asm/asm-offsets.h | 1 +
712 arch/parisc/include/asm/asm-offsets.h | 1 +
713 arch/powerpc/include/asm/asm-offsets.h | 1 +
714 arch/powerpc/platforms/52xx/efika.c | 2 +-
715 arch/powerpc/platforms/amigaone/setup.c | 2 +-
716 arch/powerpc/platforms/chrp/setup.c | 2 +-
717 arch/powerpc/platforms/powermac/bootx_init.c | 2 +-
718 arch/s390/include/asm/asm-offsets.h | 1 +
719 arch/sh/Makefile | 10 +--
720 arch/sh/include/asm/.gitignore | 1 -
721 arch/sh/include/asm/asm-offsets.h | 1 +
722 arch/sh/include/asm/machvec.h | 2 +-
723 arch/sh/tools/Makefile | 4 +-
724 arch/sh/tools/gen-mach-types | 2 +-
725 arch/sparc/include/asm/asm-offsets.h | 1 +
726 arch/um/Makefile | 2 +-
727 arch/um/include/asm/asm-offsets.h | 1 +
728 arch/x86/boot/header.S | 2 +-
729 arch/x86/boot/version.c | 4 +-
730 arch/x86/include/asm/asm-offsets.h | 1 +
731 arch/xtensa/include/asm/asm-offsets.h | 1 +
732 drivers/accessibility/braille/braille_console.c | 1 -
733 drivers/hid/hid-lg.h | 2 -
734 drivers/platform/x86/compal-laptop.c | 1 -
735 drivers/staging/panel/panel.c | 2 +-
736 include/linux/mmdebug.h | 2 -
737 include/linux/mmzone.h | 2 +-
738 include/linux/page-flags.h | 2 +-
739 include/linux/vermagic.h | 2 +-
740 init/Makefile | 6 +-
741 init/version.c | 4 +-
742 kernel/bounds.c | 2 +-
743 kernel/kexec.c | 2 +-
744 kernel/trace/trace.c | 2 +-
745 scripts/basic/fixdep.c | 10 ++--
746 scripts/kconfig/confdata.c | 2 +-
747 scripts/mkcompile_h | 2 +-
748 68 files changed, 85 insertions(+), 139 deletions(-)
749 create mode 100644 arch/alpha/include/asm/asm-offsets.h
750 create mode 100644 arch/arm/include/asm/asm-offsets.h
751 create mode 100644 arch/arm/include/asm/mach-types.h
752 create mode 100644 arch/avr32/include/asm/asm-offsets.h
753 create mode 100644 arch/blackfin/include/asm/asm-offsets.h
754 create mode 100644 arch/cris/include/asm/asm-offsets.h
755 create mode 100644 arch/frv/include/asm/asm-offsets.h
756 create mode 100644 arch/h8300/include/asm/asm-offsets.h
757 create mode 100644 arch/ia64/include/asm/asm-offsets.h
758 create mode 100644 arch/m68k/include/asm/asm-offsets.h
759 create mode 100644 arch/microblaze/include/asm/asm-offsets.h
760 create mode 100644 arch/mips/include/asm/asm-offsets.h
761 create mode 100644 arch/mn10300/include/asm/asm-offsets.h
762 create mode 100644 arch/parisc/include/asm/asm-offsets.h
763 create mode 100644 arch/powerpc/include/asm/asm-offsets.h
764 create mode 100644 arch/s390/include/asm/asm-offsets.h
765 delete mode 100644 arch/sh/include/asm/.gitignore
766 create mode 100644 arch/sh/include/asm/asm-offsets.h
767 create mode 100644 arch/sparc/include/asm/asm-offsets.h
768 create mode 100644 arch/um/include/asm/asm-offsets.h
769 create mode 100644 arch/x86/include/asm/asm-offsets.h
770 create mode 100644 arch/xtensa/include/asm/asm-offsets.h
771 Merging kconfig/for-next
772 $ git merge kconfig/for-next
773 Removing scripts/binoffset.c
774 Merge made by recursive.
775 Documentation/dontdiff | 1 -
776 scripts/.gitignore | 1 -
777 scripts/binoffset.c | 163 ----------------------------------------------
778 scripts/extract-ikconfig | 127 ++++++++++++-----------------------
779 4 files changed, 44 insertions(+), 248 deletions(-)
780 delete mode 100644 scripts/binoffset.c
781 Merging ide/master
782 $ git merge ide/master
783 Already up-to-date.
784 Merging libata/NEXT
785 $ git merge libata/NEXT
786 Already up-to-date.
787 Merging infiniband/for-next
788 $ git merge infiniband/for-next
789 Already up-to-date.
790 Merging acpi/test
791 $ git merge acpi/test
792 Auto-merging arch/x86/kernel/e820.c
793 Merge made by recursive.
794 arch/x86/kernel/e820.c | 11 ++-
795 drivers/acpi/Kconfig | 4 +-
796 drivers/acpi/ac.c | 1 +
797 drivers/acpi/dock.c | 259 +++++++++++++++++++----------------------------
798 drivers/acpi/pci_root.c | 12 ++
799 5 files changed, 127 insertions(+), 160 deletions(-)
800 Merging ieee1394/for-next
801 $ git merge ieee1394/for-next
802 Auto-merging MAINTAINERS
803 Merge made by recursive.
804 Documentation/debugging-via-ohci1394.txt | 8 ++++----
805 MAINTAINERS | 1 +
806 2 files changed, 5 insertions(+), 4 deletions(-)
807 Merging ubi/linux-next
808 $ git merge ubi/linux-next
809 Already up-to-date.
810 Merging kvm/linux-next
811 $ git merge kvm/linux-next
812 Auto-merging arch/x86/include/asm/kvm_host.h
813 Auto-merging arch/x86/kvm/lapic.c
814 Auto-merging arch/x86/kvm/mmu.c
815 Auto-merging arch/x86/kvm/svm.c
816 Auto-merging arch/x86/kvm/vmx.c
817 Auto-merging arch/x86/kvm/x86.c
818 Auto-merging virt/kvm/kvm_main.c
819 Merge made by recursive.
820 arch/ia64/include/asm/kvm.h | 1 +
821 arch/ia64/include/asm/kvm_host.h | 1 -
822 arch/ia64/kvm/Makefile | 2 +-
823 arch/ia64/kvm/kvm-ia64.c | 19 +-
824 arch/powerpc/kvm/powerpc.c | 5 +-
825 arch/s390/kvm/kvm-s390.c | 5 +-
826 arch/x86/include/asm/kvm.h | 1 +
827 arch/x86/include/asm/kvm_host.h | 21 +-
828 arch/x86/kvm/Makefile | 3 +-
829 arch/x86/kvm/emulate.c | 154 ++++++-
830 arch/x86/kvm/i8254.c | 2 -
831 arch/x86/kvm/i8259.c | 44 +-
832 arch/x86/kvm/irq.h | 1 +
833 arch/x86/kvm/lapic.c | 8 +-
834 arch/x86/kvm/mmu.c | 2 +-
835 arch/x86/kvm/svm.c | 166 ++++----
836 arch/x86/kvm/vmx.c | 188 ++++-----
837 arch/x86/kvm/x86.c | 205 +++++----
838 include/linux/kvm_host.h | 52 ++-
839 virt/kvm/assigned-dev.c | 818 ++++++++++++++++++++++++++++++++++
840 virt/kvm/eventfd.c | 2 -
841 virt/kvm/ioapic.c | 80 +++-
842 virt/kvm/ioapic.h | 5 +
843 virt/kvm/irq_comm.c | 221 ++++++----
844 virt/kvm/kvm_main.c | 894 ++++----------------------------------
845 25 files changed, 1628 insertions(+), 1272 deletions(-)
846 create mode 100644 virt/kvm/assigned-dev.c
847 Merging dlm/next
848 $ git merge dlm/next
849 Already up-to-date.
850 Merging scsi/master
851 $ git merge scsi/master
852 Already up-to-date.
853 Merging async_tx/next
854 $ git merge async_tx/next
855 Already up-to-date.
856 Merging net/master
857 $ git merge net/master
858 Auto-merging Documentation/kernel-parameters.txt
859 Auto-merging drivers/net/bonding/bond_sysfs.c
860 Auto-merging drivers/net/igb/igb_ethtool.c
861 Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c
862 Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c
863 Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c
864 Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c
865 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
866 Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c
867 Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c
868 Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c
869 Auto-merging drivers/net/wireless/iwmc3200wifi/main.c
870 Auto-merging drivers/net/wireless/libertas/cmd.c
871 Auto-merging drivers/net/wireless/libertas/cmdresp.c
872 Removing drivers/net/wireless/wl12xx/wl1251_netlink.h
873 Auto-merging net/wireless/core.c
874 Removing net/wireless/wext.c
875 Merge made by recursive.
876 Documentation/isdn/README.gigaset | 34 +-
877 Documentation/kernel-parameters.txt | 3 +
878 Documentation/networking/bonding.txt | 42 +-
879 Documentation/networking/ip-sysctl.txt | 18 +
880 arch/alpha/include/asm/socket.h | 2 +
881 arch/arm/include/asm/socket.h | 2 +
882 arch/avr32/include/asm/socket.h | 2 +
883 arch/cris/include/asm/socket.h | 2 +
884 arch/frv/include/asm/socket.h | 2 +
885 arch/h8300/include/asm/socket.h | 2 +
886 arch/ia64/include/asm/socket.h | 2 +
887 arch/m32r/include/asm/socket.h | 2 +
888 arch/m68k/include/asm/socket.h | 2 +
889 arch/mips/include/asm/socket.h | 2 +
890 arch/mn10300/include/asm/socket.h | 2 +
891 arch/parisc/include/asm/socket.h | 2 +
892 arch/powerpc/include/asm/socket.h | 2 +
893 arch/s390/include/asm/socket.h | 2 +
894 arch/sparc/include/asm/socket.h | 2 +
895 arch/xtensa/include/asm/socket.h | 2 +
896 drivers/infiniband/hw/nes/nes_nic.c | 12 +-
897 drivers/isdn/gigaset/Kconfig | 25 +-
898 drivers/isdn/gigaset/Makefile | 5 +-
899 drivers/isdn/gigaset/asyncdata.c | 124 +-
900 drivers/isdn/gigaset/bas-gigaset.c | 4 +-
901 drivers/isdn/gigaset/capi.c | 2273 ++++++++++++++++++++++++++
902 drivers/isdn/gigaset/common.c | 76 +-
903 drivers/isdn/gigaset/dummyll.c | 68 +
904 drivers/isdn/gigaset/ev-layer.c | 90 +-
905 drivers/isdn/gigaset/gigaset.h | 97 +-
906 drivers/isdn/gigaset/i4l.c | 506 ++++---
907 drivers/isdn/gigaset/isocdata.c | 79 +-
908 drivers/isdn/mISDN/socket.c | 3 +-
909 drivers/net/benet/be.h | 1 -
910 drivers/net/benet/be_cmds.c | 59 +
911 drivers/net/benet/be_cmds.h | 37 +
912 drivers/net/benet/be_ethtool.c | 43 +-
913 drivers/net/benet/be_main.c | 6 +-
914 drivers/net/bnx2x.h | 67 +-
915 drivers/net/bnx2x_hsi.h | 16 +-
916 drivers/net/bnx2x_main.c | 882 ++++++++--
917 drivers/net/bonding/bond_main.c | 71 +-
918 drivers/net/bonding/bond_sysfs.c | 53 +
919 drivers/net/bonding/bonding.h | 11 +-
920 drivers/net/can/Kconfig | 7 +
921 drivers/net/can/Makefile | 1 +
922 drivers/net/can/ti_hecc.c | 1006 ++++++++++++
923 drivers/net/cnic.c | 1811 ++++++++++++++++++++-
924 drivers/net/cnic.h | 64 +
925 drivers/net/cnic_defs.h | 1917 ++++++++++++++++++++++
926 drivers/net/cnic_if.h | 14 +-
927 drivers/net/davinci_emac.c | 26 +-
928 drivers/net/e1000/e1000.h | 1 -
929 drivers/net/e1000/e1000_ethtool.c | 12 +-
930 drivers/net/e1000/e1000_main.c | 41 +-
931 drivers/net/e1000e/e1000.h | 1 -
932 drivers/net/e1000e/ethtool.c | 18 +-
933 drivers/net/e1000e/netdev.c | 43 +-
934 drivers/net/ibm_newemac/core.c | 10 +-
935 drivers/net/igb/e1000_82575.c | 306 ++--
936 drivers/net/igb/e1000_82575.h | 1 +
937 drivers/net/igb/e1000_hw.h | 8 +-
938 drivers/net/igb/e1000_mac.c | 100 +-
939 drivers/net/igb/e1000_mbx.c | 82 +-
940 drivers/net/igb/e1000_nvm.c | 36 +-
941 drivers/net/igb/e1000_phy.c | 207 +++-
942 drivers/net/igb/e1000_phy.h | 4 +-
943 drivers/net/igb/e1000_regs.h | 1 +
944 drivers/net/igb/igb.h | 1 -
945 drivers/net/igb/igb_ethtool.c | 20 +-
946 drivers/net/igb/igb_main.c | 304 +++-
947 drivers/net/igbvf/ethtool.c | 25 +-
948 drivers/net/ixgb/ixgb.h | 1 -
949 drivers/net/ixgb/ixgb_ethtool.c | 44 +-
950 drivers/net/ixgb/ixgb_main.c | 44 +-
951 drivers/net/ixgbe/ixgbe.h | 3 +-
952 drivers/net/ixgbe/ixgbe_82599.c | 128 ++-
953 drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +-
954 drivers/net/ixgbe/ixgbe_ethtool.c | 40 +-
955 drivers/net/ixgbe/ixgbe_main.c | 28 +-
956 drivers/net/ixgbe/ixgbe_type.h | 11 +
957 drivers/net/myri10ge/myri10ge.c | 5 +-
958 drivers/net/netxen/netxen_nic.h | 2 -
959 drivers/net/netxen/netxen_nic_main.c | 2 +-
960 drivers/net/niu.c | 7 +-
961 drivers/net/pasemi_mac_ethtool.c | 14 +
962 drivers/net/ppp_async.c | 5 +-
963 drivers/net/ppp_synctty.c | 5 +-
964 drivers/net/pppox.c | 2 +-
965 drivers/net/qlge/qlge.h | 25 +-
966 drivers/net/qlge/qlge_ethtool.c | 69 +
967 drivers/net/qlge/qlge_main.c | 53 +-
968 drivers/net/qlge/qlge_mpi.c | 25 +-
969 drivers/net/tehuti.c | 27 +-
970 drivers/net/usb/cdc_ether.c | 20 +-
971 drivers/net/usb/usbnet.c | 17 +
972 drivers/net/vxge/vxge-config.c | 300 +---
973 drivers/net/vxge/vxge-config.h | 2 +
974 drivers/net/vxge/vxge-main.c | 104 +-
975 drivers/net/vxge/vxge-main.h | 1 -
976 drivers/net/vxge/vxge-reg.h | 4 -
977 drivers/net/vxge/vxge-traffic.c | 4 +-
978 drivers/net/vxge/vxge-traffic.h | 2 +
979 drivers/net/vxge/vxge-version.h | 4 +-
980 drivers/net/wireless/Kconfig | 84 +-
981 drivers/net/wireless/at76c50x-usb.c | 10 +
982 drivers/net/wireless/ath/Kconfig | 8 +
983 drivers/net/wireless/ath/Makefile | 9 +-
984 drivers/net/wireless/ath/ar9170/ar9170.h | 4 +-
985 drivers/net/wireless/ath/ar9170/cmd.c | 3 +-
986 drivers/net/wireless/ath/ar9170/cmd.h | 1 +
987 drivers/net/wireless/ath/ar9170/hw.h | 2 +
988 drivers/net/wireless/ath/ar9170/mac.c | 15 +-
989 drivers/net/wireless/ath/ar9170/main.c | 30 +-
990 drivers/net/wireless/ath/ar9170/phy.c | 99 +-
991 drivers/net/wireless/ath/ath.h | 41 +
992 drivers/net/wireless/ath/ath5k/ath5k.h | 40 +-
993 drivers/net/wireless/ath/ath5k/attach.c | 31 +-
994 drivers/net/wireless/ath/ath5k/base.c | 116 +-
995 drivers/net/wireless/ath/ath5k/base.h | 12 -
996 drivers/net/wireless/ath/ath5k/initvals.c | 4 +-
997 drivers/net/wireless/ath/ath5k/pcu.c | 193 +--
998 drivers/net/wireless/ath/ath5k/reg.h | 8 +-
999 drivers/net/wireless/ath/ath5k/reset.c | 16 +-
1000 drivers/net/wireless/ath/ath9k/Kconfig | 8 +
1001 drivers/net/wireless/ath/ath9k/Makefile | 27 +-
1002 drivers/net/wireless/ath/ath9k/ahb.c | 19 +-
1003 drivers/net/wireless/ath/ath9k/ani.c | 141 +-
1004 drivers/net/wireless/ath/ath9k/ath9k.h | 73 +-
1005 drivers/net/wireless/ath/ath9k/beacon.c | 112 +-
1006 drivers/net/wireless/ath/ath9k/btcoex.c | 383 ++---
1007 drivers/net/wireless/ath/ath9k/btcoex.h | 64 +-
1008 drivers/net/wireless/ath/ath9k/calib.c | 391 +++--
1009 drivers/net/wireless/ath/ath9k/calib.h | 2 +
1010 drivers/net/wireless/ath/ath9k/debug.c | 55 +-
1011 drivers/net/wireless/ath/ath9k/debug.h | 36 +-
1012 drivers/net/wireless/ath/ath9k/eeprom.c | 8 +-
1013 drivers/net/wireless/ath/ath9k/eeprom.h | 9 +-
1014 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 90 +-
1015 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 97 +-
1016 drivers/net/wireless/ath/ath9k/eeprom_def.c | 183 ++-
1017 drivers/net/wireless/ath/ath9k/hw.c | 595 ++++----
1018 drivers/net/wireless/ath/ath9k/hw.h | 63 +-
1019 drivers/net/wireless/ath/ath9k/initvals.h | 72 +-
1020 drivers/net/wireless/ath/ath9k/mac.c | 162 ++-
1021 drivers/net/wireless/ath/ath9k/mac.h | 11 +-
1022 drivers/net/wireless/ath/ath9k/main.c | 841 +++++++---
1023 drivers/net/wireless/ath/ath9k/pci.c | 37 +-
1024 drivers/net/wireless/ath/ath9k/phy.c | 50 +-
1025 drivers/net/wireless/ath/ath9k/phy.h | 1 +
1026 drivers/net/wireless/ath/ath9k/rc.c | 33 +-
1027 drivers/net/wireless/ath/ath9k/recv.c | 62 +-
1028 drivers/net/wireless/ath/ath9k/reg.h | 5 +-
1029 drivers/net/wireless/ath/ath9k/virtual.c | 22 +-
1030 drivers/net/wireless/ath/ath9k/xmit.c | 113 +-
1031 drivers/net/wireless/ath/debug.c | 32 +
1032 drivers/net/wireless/ath/debug.h | 77 +
1033 drivers/net/wireless/ath/hw.c | 126 ++
1034 drivers/net/wireless/ath/reg.h | 27 +
1035 drivers/net/wireless/b43/phy_lp.c | 6 +
1036 drivers/net/wireless/hostap/Kconfig | 2 +
1037 drivers/net/wireless/ipw2x00/Kconfig | 7 +-
1038 drivers/net/wireless/ipw2x00/ipw2200.c | 1 +
1039 drivers/net/wireless/iwlwifi/Kconfig | 28 +-
1040 drivers/net/wireless/iwlwifi/Makefile | 12 +-
1041 drivers/net/wireless/iwlwifi/iwl-1000.c | 35 +-
1042 drivers/net/wireless/iwlwifi/iwl-3945-led.c | 371 +----
1043 drivers/net/wireless/iwlwifi/iwl-3945-led.h | 22 +-
1044 drivers/net/wireless/iwlwifi/iwl-3945.c | 65 +-
1045 drivers/net/wireless/iwlwifi/iwl-3945.h | 2 +-
1046 drivers/net/wireless/iwlwifi/iwl-4965.c | 71 +-
1047 drivers/net/wireless/iwlwifi/iwl-5000.c | 127 +-
1048 drivers/net/wireless/iwlwifi/iwl-6000.c | 245 +++-
1049 drivers/net/wireless/iwlwifi/iwl-agn-led.c | 85 +
1050 drivers/net/wireless/iwlwifi/iwl-agn-led.h | 32 +
1051 drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 466 +++---
1052 drivers/net/wireless/iwlwifi/iwl-agn.c | 124 ++-
1053 drivers/net/wireless/iwlwifi/iwl-calib.c | 66 +-
1054 drivers/net/wireless/iwlwifi/iwl-commands.h | 12 +-
1055 drivers/net/wireless/iwlwifi/iwl-core.c | 209 ++-
1056 drivers/net/wireless/iwlwifi/iwl-core.h | 31 +-
1057 drivers/net/wireless/iwlwifi/iwl-csr.h | 7 +-
1058 drivers/net/wireless/iwlwifi/iwl-debug.h | 2 -
1059 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 17 +-
1060 drivers/net/wireless/iwlwifi/iwl-dev.h | 31 +-
1061 drivers/net/wireless/iwlwifi/iwl-devtrace.c | 13 +
1062 drivers/net/wireless/iwlwifi/iwl-devtrace.h | 178 ++
1063 drivers/net/wireless/iwlwifi/iwl-eeprom.c | 45 +-
1064 drivers/net/wireless/iwlwifi/iwl-eeprom.h | 17 +-
1065 drivers/net/wireless/iwlwifi/iwl-io.h | 16 +-
1066 drivers/net/wireless/iwlwifi/iwl-led.c | 323 +---
1067 drivers/net/wireless/iwlwifi/iwl-led.h | 46 +-
1068 drivers/net/wireless/iwlwifi/iwl-power.c | 149 ++-
1069 drivers/net/wireless/iwlwifi/iwl-power.h | 3 +
1070 drivers/net/wireless/iwlwifi/iwl-scan.c | 1 -
1071 drivers/net/wireless/iwlwifi/iwl-tx.c | 26 +-
1072 drivers/net/wireless/iwlwifi/iwl3945-base.c | 28 +-
1073 drivers/net/wireless/iwmc3200wifi/main.c | 2 +
1074 drivers/net/wireless/libertas/Kconfig | 39 +
1075 drivers/net/wireless/libertas/Makefile | 15 +-
1076 drivers/net/wireless/libertas/README | 26 +-
1077 drivers/net/wireless/libertas/cfg.c | 198 +++
1078 drivers/net/wireless/libertas/cfg.h | 16 +
1079 drivers/net/wireless/libertas/cmd.c | 106 ++-
1080 drivers/net/wireless/libertas/cmdresp.c | 12 +
1081 drivers/net/wireless/libertas/decl.h | 3 +
1082 drivers/net/wireless/libertas/defs.h | 2 +
1083 drivers/net/wireless/libertas/dev.h | 19 +
1084 drivers/net/wireless/libertas/host.h | 1 +
1085 drivers/net/wireless/libertas/if_cs.c | 3 +
1086 drivers/net/wireless/libertas/if_sdio.c | 56 +
1087 drivers/net/wireless/libertas/if_sdio.h | 3 +-
1088 drivers/net/wireless/libertas/if_spi.c | 3 +
1089 drivers/net/wireless/libertas/if_usb.c | 3 +
1090 drivers/net/wireless/libertas/main.c | 171 ++-
1091 drivers/net/wireless/libertas/wext.c | 54 +-
1092 drivers/net/wireless/orinoco/Kconfig | 4 +-
1093 drivers/net/wireless/orinoco/main.c | 1 +
1094 drivers/net/wireless/wl12xx/wl1251_netlink.h | 30 -
1095 drivers/s390/net/qeth_core.h | 2 +-
1096 drivers/s390/net/qeth_core_main.c | 11 +-
1097 drivers/s390/net/qeth_l2_main.c | 4 +-
1098 drivers/s390/net/qeth_l3_main.c | 2 +-
1099 drivers/staging/rtl8187se/Kconfig | 3 +-
1100 drivers/staging/rtl8192e/Kconfig | 3 +-
1101 drivers/staging/vt6655/Kconfig | 4 +-
1102 drivers/staging/vt6656/Kconfig | 4 +-
1103 include/asm-generic/socket.h | 1 +
1104 include/linux/can/platform/ti_hecc.h | 40 +
1105 include/linux/ethtool.h | 36 +-
1106 include/linux/if_tunnel.h | 12 +
1107 include/linux/ipv6.h | 2 +
1108 include/linux/mroute.h | 13 +-
1109 include/linux/netdevice.h | 2 +-
1110 include/linux/nl80211.h | 2 +
1111 include/linux/notifier.h | 1 +
1112 include/linux/skbuff.h | 6 +-
1113 include/linux/udp.h | 6 +-
1114 include/linux/usb/usbnet.h | 1 +
1115 include/net/bluetooth/bluetooth.h | 2 +-
1116 include/net/cfg80211.h | 9 +-
1117 include/net/gen_stats.h | 1 +
1118 include/net/ip_fib.h | 25 +-
1119 include/net/ipip.h | 19 +-
1120 include/net/iw_handler.h | 14 +-
1121 include/net/net_namespace.h | 2 +-
1122 include/net/sock.h | 6 +-
1123 include/net/udp.h | 13 +-
1124 include/net/wext.h | 49 +-
1125 net/appletalk/ddp.c | 2 +-
1126 net/atm/common.c | 2 +-
1127 net/atm/pvc.c | 2 +-
1128 net/atm/svc.c | 2 +-
1129 net/ax25/af_ax25.c | 2 +-
1130 net/bluetooth/af_bluetooth.c | 6 +-
1131 net/bluetooth/bnep/sock.c | 2 +-
1132 net/bluetooth/cmtp/sock.c | 2 +-
1133 net/bluetooth/hci_sock.c | 2 +-
1134 net/bluetooth/hidp/sock.c | 2 +-
1135 net/bluetooth/l2cap.c | 2 +-
1136 net/bluetooth/rfcomm/sock.c | 4 +-
1137 net/bluetooth/sco.c | 2 +-
1138 net/bridge/br_device.c | 1 +
1139 net/can/af_can.c | 2 +-
1140 net/can/bcm.c | 2 +-
1141 net/can/raw.c | 2 +-
1142 net/core/dev.c | 8 +-
1143 net/core/ethtool.c | 81 +-
1144 net/core/gen_stats.c | 8 +-
1145 net/core/net-sysfs.c | 46 +-
1146 net/core/pktgen.c | 11 +-
1147 net/core/sock.c | 17 +-
1148 net/dccp/ccids/ccid2.c | 327 ++--
1149 net/dccp/ccids/ccid2.h | 46 +-
1150 net/dccp/ccids/ccid3.c | 400 +++---
1151 net/dccp/ccids/ccid3.h | 120 +-
1152 net/dccp/ipv6.c | 12 +-
1153 net/dccp/probe.c | 16 +-
1154 net/decnet/af_decnet.c | 2 +-
1155 net/econet/af_econet.c | 10 +-
1156 net/ieee802154/af_ieee802154.c | 2 +-
1157 net/ieee802154/dgram.c | 2 +-
1158 net/ieee802154/raw.c | 2 +-
1159 net/ipv4/af_inet.c | 2 +-
1160 net/ipv4/cipso_ipv4.c | 2 +-
1161 net/ipv4/fib_frontend.c | 26 +-
1162 net/ipv4/fib_hash.c | 25 +-
1163 net/ipv4/fib_rules.c | 2 +-
1164 net/ipv4/fib_trie.c | 26 +-
1165 net/ipv4/icmp.c | 4 +
1166 net/ipv4/inet_connection_sock.c | 1 +
1167 net/ipv4/ip_gre.c | 5 +-
1168 net/ipv4/ipip.c | 5 +-
1169 net/ipv4/ipmr.c | 12 +-
1170 net/ipv4/raw.c | 2 +-
1171 net/ipv4/syncookies.c | 3 +-
1172 net/ipv4/udp.c | 93 +-
1173 net/ipv4/udplite.c | 4 +-
1174 net/ipv6/Kconfig | 19 +
1175 net/ipv6/addrconf.c | 8 +
1176 net/ipv6/af_inet6.c | 3 +-
1177 net/ipv6/datagram.c | 25 +-
1178 net/ipv6/inet6_connection_sock.c | 1 +
1179 net/ipv6/ipv6_sockglue.c | 1 +
1180 net/ipv6/ndisc.c | 1 +
1181 net/ipv6/raw.c | 2 +-
1182 net/ipv6/route.c | 3 +-
1183 net/ipv6/sit.c | 134 ++-
1184 net/ipv6/syncookies.c | 1 +
1185 net/ipv6/tcp_ipv6.c | 16 +-
1186 net/ipv6/udp.c | 14 +-
1187 net/ipx/af_ipx.c | 2 +-
1188 net/irda/af_irda.c | 2 +-
1189 net/iucv/af_iucv.c | 2 +-
1190 net/key/af_key.c | 4 +-
1191 net/llc/af_llc.c | 2 +-
1192 net/mac80211/iface.c | 10 +-
1193 net/netlink/af_netlink.c | 2 +-
1194 net/netrom/af_netrom.c | 2 +-
1195 net/packet/af_packet.c | 12 +-
1196 net/phonet/af_phonet.c | 2 +-
1197 net/rds/af_rds.c | 2 +-
1198 net/rose/af_rose.c | 2 +-
1199 net/rxrpc/af_rxrpc.c | 2 +-
1200 net/rxrpc/ar-recvmsg.c | 2 +-
1201 net/sched/act_api.c | 3 +-
1202 net/sched/sch_api.c | 2 +-
1203 net/sched/sch_cbq.c | 2 +-
1204 net/sched/sch_drr.c | 2 +-
1205 net/sched/sch_hfsc.c | 2 +-
1206 net/sched/sch_htb.c | 2 +-
1207 net/sctp/socket.c | 2 +-
1208 net/socket.c | 22 +-
1209 net/sunrpc/svcauth_unix.c | 3 +-
1210 net/unix/af_unix.c | 2 +-
1211 net/wireless/Kconfig | 50 +-
1212 net/wireless/Makefile | 10 +-
1213 net/wireless/core.c | 24 +-
1214 net/wireless/ethtool.c | 45 +
1215 net/wireless/ethtool.h | 6 +
1216 net/wireless/ibss.c | 10 +-
1217 net/wireless/mlme.c | 2 +-
1218 net/wireless/nl80211.c | 6 +-
1219 net/wireless/scan.c | 6 +-
1220 net/wireless/sme.c | 12 +-
1221 net/wireless/wext-core.c | 1063 ++++++++++++
1222 net/wireless/wext-priv.c | 248 +++
1223 net/wireless/wext-proc.c | 155 ++
1224 net/wireless/wext-spy.c | 231 +++
1225 net/wireless/wext.c | 1775 --------------------
1226 net/x25/af_x25.c | 2 +-
1227 351 files changed, 18239 insertions(+), 7625 deletions(-)
1228 create mode 100644 drivers/isdn/gigaset/capi.c
1229 create mode 100644 drivers/isdn/gigaset/dummyll.c
1230 create mode 100644 drivers/net/can/ti_hecc.c
1231 create mode 100644 drivers/net/wireless/ath/debug.c
1232 create mode 100644 drivers/net/wireless/ath/debug.h
1233 create mode 100644 drivers/net/wireless/ath/hw.c
1234 create mode 100644 drivers/net/wireless/ath/reg.h
1235 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c
1236 create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h
1237 create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.c
1238 create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.h
1239 create mode 100644 drivers/net/wireless/libertas/Kconfig
1240 create mode 100644 drivers/net/wireless/libertas/cfg.c
1241 create mode 100644 drivers/net/wireless/libertas/cfg.h
1242 delete mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.h
1243 create mode 100644 include/linux/can/platform/ti_hecc.h
1244 create mode 100644 net/wireless/ethtool.c
1245 create mode 100644 net/wireless/ethtool.h
1246 create mode 100644 net/wireless/wext-core.c
1247 create mode 100644 net/wireless/wext-priv.c
1248 create mode 100644 net/wireless/wext-proc.c
1249 create mode 100644 net/wireless/wext-spy.c
1250 delete mode 100644 net/wireless/wext.c
1251 Merging wireless/master
1252 $ git merge wireless/master
1253 Auto-merging MAINTAINERS
1254 Auto-merging drivers/net/wireless/b43/leds.h
1255 Auto-merging drivers/net/wireless/b43/main.c
1256 Auto-merging drivers/net/wireless/b43legacy/main.c
1257 Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c
1258 Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c
1259 Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c
1260 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
1261 Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h
1262 Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c
1263 Auto-merging drivers/net/wireless/iwlwifi/iwl-hcmd.c
1264 Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c
1265 Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c
1266 Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c
1267 Merge made by recursive.
1268 MAINTAINERS | 1 -
1269 drivers/net/wireless/airo.c | 3 +-
1270 drivers/net/wireless/ath/ath9k/calib.c | 28 +-
1271 drivers/net/wireless/ath/ath9k/xmit.c | 2 +
1272 drivers/net/wireless/b43/leds.h | 1 +
1273 drivers/net/wireless/b43/main.c | 4 +-
1274 drivers/net/wireless/b43legacy/main.c | 4 +-
1275 drivers/net/wireless/iwlwifi/iwl-1000.c | 5 +-
1276 drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 6 -
1277 drivers/net/wireless/iwlwifi/iwl-3945.c | 215 +++++----
1278 drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 3 -
1279 drivers/net/wireless/iwlwifi/iwl-4965.c | 94 +---
1280 drivers/net/wireless/iwlwifi/iwl-5000.c | 99 ++---
1281 drivers/net/wireless/iwlwifi/iwl-6000.c | 41 ++-
1282 drivers/net/wireless/iwlwifi/iwl-agn.c | 50 +--
1283 drivers/net/wireless/iwlwifi/iwl-calib.c | 9 +-
1284 drivers/net/wireless/iwlwifi/iwl-commands.h | 63 +++-
1285 drivers/net/wireless/iwlwifi/iwl-core.c | 52 ++-
1286 drivers/net/wireless/iwlwifi/iwl-core.h | 10 +-
1287 drivers/net/wireless/iwlwifi/iwl-debugfs.c | 645 +++++++++++++++++----------
1288 drivers/net/wireless/iwlwifi/iwl-dev.h | 51 ++-
1289 drivers/net/wireless/iwlwifi/iwl-hcmd.c | 21 +-
1290 drivers/net/wireless/iwlwifi/iwl-rx.c | 163 +++++--
1291 drivers/net/wireless/iwlwifi/iwl-scan.c | 20 +-
1292 drivers/net/wireless/iwlwifi/iwl-spectrum.c | 2 +-
1293 drivers/net/wireless/iwlwifi/iwl-sta.c | 62 +--
1294 drivers/net/wireless/iwlwifi/iwl-tx.c | 36 +-
1295 drivers/net/wireless/iwlwifi/iwl3945-base.c | 224 +++++-----
1296 drivers/net/wireless/libertas/debugfs.c | 27 +-
1297 drivers/net/wireless/libertas/main.c | 2 +
1298 drivers/net/wireless/libertas/scan.c | 11 +-
1299 drivers/net/wireless/libertas/wext.c | 10 +-
1300 drivers/net/wireless/orinoco/hw.c | 33 +-
1301 drivers/net/wireless/orinoco/hw.h | 3 +-
1302 drivers/net/wireless/orinoco/main.c | 33 +--
1303 drivers/net/wireless/orinoco/orinoco.h | 1 -
1304 drivers/net/wireless/wl12xx/wl1271.h | 48 ++-
1305 drivers/net/wireless/wl12xx/wl1271_acx.c | 133 +++++-
1306 drivers/net/wireless/wl12xx/wl1271_acx.h | 57 ++-
1307 drivers/net/wireless/wl12xx/wl1271_boot.c | 194 +++++----
1308 drivers/net/wireless/wl12xx/wl1271_boot.h | 22 +-
1309 drivers/net/wireless/wl12xx/wl1271_cmd.c | 102 ++++-
1310 drivers/net/wireless/wl12xx/wl1271_cmd.h | 33 ++-
1311 drivers/net/wireless/wl12xx/wl1271_event.c | 26 +-
1312 drivers/net/wireless/wl12xx/wl1271_init.c | 20 +-
1313 drivers/net/wireless/wl12xx/wl1271_main.c | 356 ++++++++++-----
1314 drivers/net/wireless/wl12xx/wl1271_ps.c | 58 ++-
1315 drivers/net/wireless/wl12xx/wl1271_ps.h | 2 +-
1316 drivers/net/wireless/wl12xx/wl1271_reg.h | 3 +-
1317 drivers/net/wireless/wl12xx/wl1271_rx.c | 20 +-
1318 drivers/net/wireless/wl12xx/wl1271_spi.c | 308 +++++++------
1319 drivers/net/wireless/wl12xx/wl1271_spi.h | 65 ++--
1320 drivers/net/wireless/wl12xx/wl1271_tx.c | 60 ++-
1321 drivers/ssb/driver_pcicore.c | 4 +-
1322 include/linux/ssb/ssb.h | 20 +-
1323 55 files changed, 2203 insertions(+), 1362 deletions(-)
1324 Merging mtd/master
1325 $ git merge mtd/master
1326 Auto-merging drivers/mtd/devices/m25p80.c
1327 Auto-merging drivers/mtd/maps/Kconfig
1328 Merge made by recursive.
1329 arch/arm/mach-nomadik/board-nhk8815.c | 11 +-
1330 drivers/mtd/devices/m25p80.c | 7 +-
1331 drivers/mtd/maps/Kconfig | 1 +
1332 drivers/mtd/maps/gpio-addr-flash.c | 5 +-
1333 drivers/mtd/maps/sa1100-flash.c | 4 +-
1334 drivers/mtd/nand/atmel_nand.c | 1 -
1335 drivers/mtd/nand/davinci_nand.c | 2 +-
1336 drivers/mtd/nand/nand_base.c | 6 +
1337 drivers/mtd/onenand/onenand_base.c | 176 ++++++++++++++++++++-------------
1338 include/linux/mtd/bbm.h | 35 ++++---
1339 include/linux/mtd/flashchip.h | 7 ++
1340 include/linux/mtd/nand.h | 93 +-----------------
1341 include/linux/mtd/onenand.h | 19 +---
1342 13 files changed, 160 insertions(+), 207 deletions(-)
1343 Merging crypto/master
1344 $ git merge crypto/master
1345 Already up-to-date.
1346 Merging sound/for-next
1347 $ git merge sound/for-next
1348 Removing include/sound/sscape_ioctl.h
1349 Merge made by recursive.
1350 Documentation/sound/alsa/ALSA-Configuration.txt | 9 +-
1351 arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h | 2 +
1352 include/sound/Kbuild | 1 -
1353 include/sound/ak4113.h | 321 ++
1354 include/sound/ak4114.h | 12 +-
1355 include/sound/ak4xxx-adda.h | 5 +-
1356 include/sound/soc-dai.h | 14 +-
1357 include/sound/soc-dapm.h | 17 +
1358 include/sound/soc.h | 1 +
1359 include/sound/sscape_ioctl.h | 21 -
1360 include/sound/tpa6130a2-plat.h | 30 +
1361 sound/core/isadma.c | 10 +-
1362 sound/i2c/other/Makefile | 3 +-
1363 sound/i2c/other/ak4113.c | 639 ++++
1364 sound/i2c/other/ak4xxx-adda.c | 136 +-
1365 sound/isa/Kconfig | 12 +-
1366 sound/isa/sscape.c | 727 ++---
1367 sound/isa/wss/wss_lib.c | 98 +-
1368 sound/pci/Kconfig | 1 -
1369 sound/pci/hda/hda_intel.c | 16 +-
1370 sound/pci/hda/patch_nvhdmi.c | 31 +-
1371 sound/pci/hda/patch_realtek.c | 137 +-
1372 sound/pci/hda/patch_via.c | 3505 +++++++++++++++++++--
1373 sound/pci/ice1712/Makefile | 2 +-
1374 sound/pci/ice1712/amp.c | 8 +-
1375 sound/pci/ice1712/ice1712.c | 12 +
1376 sound/pci/ice1712/ice1712.h | 14 +-
1377 sound/pci/ice1712/ice1724.c | 105 +-
1378 sound/pci/ice1712/juli.c | 24 +-
1379 sound/pci/ice1712/quartet.c | 1130 +++++++
1380 sound/pci/ice1712/quartet.h | 10 +
1381 sound/pci/oxygen/Makefile | 3 +-
1382 sound/pci/oxygen/cs2000.h | 83 +
1383 sound/pci/oxygen/hifier.c | 61 +-
1384 sound/pci/oxygen/oxygen.c | 248 ++-
1385 sound/pci/oxygen/oxygen.h | 5 +
1386 sound/pci/oxygen/oxygen_lib.c | 29 +-
1387 sound/pci/oxygen/oxygen_mixer.c | 52 +-
1388 sound/pci/oxygen/oxygen_pcm.c | 19 +-
1389 sound/pci/oxygen/virtuoso.c | 1105 +-------
1390 sound/pci/oxygen/xonar.h | 50 +
1391 sound/pci/oxygen/xonar_cs43xx.c | 434 +++
1392 sound/pci/oxygen/xonar_hdmi.c | 128 +
1393 sound/pci/oxygen/xonar_lib.c | 132 +
1394 sound/pci/oxygen/xonar_pcm179x.c | 1115 +++++++
1395 sound/soc/atmel/playpaq_wm8510.c | 2 +-
1396 sound/soc/atmel/sam9g20_wm8731.c | 2 +-
1397 sound/soc/blackfin/bf5xx-ad1836.c | 7 +
1398 sound/soc/blackfin/bf5xx-ad1938.c | 9 +-
1399 sound/soc/blackfin/bf5xx-i2s.c | 15 +-
1400 sound/soc/blackfin/bf5xx-tdm-pcm.c | 9 +-
1401 sound/soc/blackfin/bf5xx-tdm.c | 45 +-
1402 sound/soc/blackfin/bf5xx-tdm.h | 11 +
1403 sound/soc/codecs/Kconfig | 12 +
1404 sound/soc/codecs/Makefile | 6 +
1405 sound/soc/codecs/ak4671.c | 825 +++++
1406 sound/soc/codecs/ak4671.h | 156 +
1407 sound/soc/codecs/tpa6130a2.c | 463 +++
1408 sound/soc/codecs/tpa6130a2.h | 62 +
1409 sound/soc/codecs/wm8350.c | 2 +-
1410 sound/soc/codecs/wm8400.c | 3 +-
1411 sound/soc/codecs/wm8510.c | 4 +-
1412 sound/soc/codecs/wm8580.c | 4 +-
1413 sound/soc/codecs/wm8711.c | 659 ++++
1414 sound/soc/codecs/wm8711.h | 42 +
1415 sound/soc/codecs/wm8753.c | 4 +-
1416 sound/soc/codecs/wm8900.c | 4 +-
1417 sound/soc/codecs/wm8940.c | 4 +-
1418 sound/soc/codecs/wm8960.c | 4 +-
1419 sound/soc/codecs/wm8974.c | 27 +-
1420 sound/soc/codecs/wm8990.c | 4 +-
1421 sound/soc/codecs/wm8993.c | 38 +-
1422 sound/soc/codecs/wm9713.c | 4 +-
1423 sound/soc/codecs/wm_hubs.c | 35 +
1424 sound/soc/codecs/wm_hubs.h | 5 +
1425 sound/soc/davinci/Kconfig | 4 +-
1426 sound/soc/davinci/davinci-evm.c | 7 +-
1427 sound/soc/davinci/davinci-i2s.c | 2 +
1428 sound/soc/davinci/davinci-mcasp.c | 17 +-
1429 sound/soc/davinci/davinci-pcm.c | 21 +-
1430 sound/soc/davinci/davinci-pcm.h | 1 +
1431 sound/soc/imx/mx27vis_wm8974.c | 2 +-
1432 sound/soc/pxa/magician.c | 2 +-
1433 sound/soc/pxa/pxa-ssp.c | 20 +-
1434 sound/soc/pxa/zylonite.c | 5 +-
1435 sound/soc/s3c24xx/Kconfig | 9 +
1436 sound/soc/s3c24xx/Makefile | 2 +
1437 sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 8 +-
1438 sound/soc/s3c24xx/neo1973_wm8753.c | 8 +-
1439 sound/soc/s3c24xx/s3c-i2s-v2.c | 30 +-
1440 sound/soc/s3c24xx/s3c64xx-i2s.c | 19 +-
1441 sound/soc/s3c24xx/s3c64xx-i2s.h | 1 +
1442 sound/soc/s3c24xx/smdk64xx_wm8580.c | 273 ++
1443 sound/soc/soc-cache.c | 46 +-
1444 sound/soc/soc-core.c | 62 +-
1445 sound/soc/soc-dapm.c | 135 +-
1446 sound/usb/usx2y/us122l.c | 75 +-
1447 97 files changed, 11380 insertions(+), 2353 deletions(-)
1448 create mode 100644 include/sound/ak4113.h
1449 delete mode 100644 include/sound/sscape_ioctl.h
1450 create mode 100644 include/sound/tpa6130a2-plat.h
1451 create mode 100644 sound/i2c/other/ak4113.c
1452 create mode 100644 sound/pci/ice1712/quartet.c
1453 create mode 100644 sound/pci/ice1712/quartet.h
1454 create mode 100644 sound/pci/oxygen/cs2000.h
1455 create mode 100644 sound/pci/oxygen/xonar.h
1456 create mode 100644 sound/pci/oxygen/xonar_cs43xx.c
1457 create mode 100644 sound/pci/oxygen/xonar_hdmi.c
1458 create mode 100644 sound/pci/oxygen/xonar_lib.c
1459 create mode 100644 sound/pci/oxygen/xonar_pcm179x.c
1460 create mode 100644 sound/soc/codecs/ak4671.c
1461 create mode 100644 sound/soc/codecs/ak4671.h
1462 create mode 100644 sound/soc/codecs/tpa6130a2.c
1463 create mode 100644 sound/soc/codecs/tpa6130a2.h
1464 create mode 100644 sound/soc/codecs/wm8711.c
1465 create mode 100644 sound/soc/codecs/wm8711.h
1466 create mode 100644 sound/soc/s3c24xx/smdk64xx_wm8580.c
1467 Merging cpufreq/next
1468 $ git merge cpufreq/next
1469 Already up-to-date.
1470 Merging quilt/rr
1471 $ git merge quilt/rr
1472 Auto-merging include/linux/Kbuild
1473 Merge made by recursive.
1474 Documentation/lguest/lguest.c | 1 -
1475 drivers/block/virtio_blk.c | 2 --
1476 drivers/char/hw_random/virtio-rng.c | 1 -
1477 drivers/char/virtio_console.c | 1 -
1478 drivers/net/virtio_net.c | 1 -
1479 drivers/virtio/virtio_balloon.c | 1 -
1480 include/linux/Kbuild | 1 +
1481 include/linux/virtio_9p.h | 1 +
1482 include/linux/virtio_balloon.h | 1 +
1483 include/linux/virtio_blk.h | 1 +
1484 include/linux/virtio_console.h | 1 +
1485 include/linux/virtio_net.h | 1 +
1486 include/linux/virtio_rng.h | 1 +
1487 net/9p/trans_virtio.c | 1 -
1488 14 files changed, 7 insertions(+), 8 deletions(-)
1489 Merging mmc/next
1490 $ git merge mmc/next
1491 Already up-to-date.
1492 Merging tmio-mmc/linux-next
1493 $ git merge tmio-mmc/linux-next
1494 Auto-merging drivers/mfd/Makefile
1495 Auto-merging drivers/mmc/core/core.c
1496 Auto-merging drivers/mmc/core/core.h
1497 Merge made by recursive.
1498 drivers/mfd/Makefile | 6 +-
1499 drivers/mfd/asic3.c | 43 +++++++++++++++----
1500 drivers/mfd/t7l66xb.c | 31 +++++++++++--
1501 drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++--------
1502 drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++----
1503 drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++
1504 drivers/mmc/core/core.c | 4 +-
1505 drivers/mmc/core/core.h | 10 ++++
1506 drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++--------------------
1507 drivers/mmc/host/tmio_mmc.h | 46 +++------------------
1508 include/linux/mfd/tmio.h | 40 ++++++++++++++++++
1509 11 files changed, 342 insertions(+), 131 deletions(-)
1510 create mode 100644 drivers/mfd/tmio_core.c
1511 Merging input/next
1512 $ git merge input/next
1513 Already up-to-date.
1514 Merging lsm/for-next
1515 $ git merge lsm/for-next
1516 Already up-to-date.
1517 Merging block/for-next
1518 $ git merge block/for-next
1519 Auto-merging MAINTAINERS
1520 Removing block/as-iosched.c
1521 Auto-merging kernel/sched.c
1522 Merge made by recursive.
1523 .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++
1524 Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++
1525 Documentation/blockdev/drbd/README.txt | 16 +
1526 Documentation/blockdev/drbd/conn-states-8.dot | 18 +
1527 Documentation/blockdev/drbd/disk-states-8.dot | 16 +
1528 .../drbd/drbd-connection-state-overview.dot | 85 +
1529 Documentation/blockdev/drbd/node-states-8.dot | 14 +
1530 MAINTAINERS | 13 +
1531 block/Kconfig.iosched | 26 +-
1532 block/Makefile | 1 -
1533 block/as-iosched.c | 1520 -------
1534 block/blk-core.c | 16 +-
1535 block/blk-merge.c | 2 +-
1536 block/blk-tag.c | 2 +-
1537 block/cfq-iosched.c | 259 +-
1538 block/elevator.c | 14 +-
1539 block/genhd.c | 4 +-
1540 drivers/block/Kconfig | 2 +
1541 drivers/block/Makefile | 1 +
1542 drivers/block/drbd/Kconfig | 71 +
1543 drivers/block/drbd/Makefile | 5 +
1544 drivers/block/drbd/drbd_actlog.c | 1424 +++++++
1545 drivers/block/drbd/drbd_bitmap.c | 1327 ++++++
1546 drivers/block/drbd/drbd_int.h | 2252 ++++++++++
1547 drivers/block/drbd/drbd_main.c | 3700 ++++++++++++++++
1548 drivers/block/drbd/drbd_nl.c | 2360 +++++++++++
1549 drivers/block/drbd/drbd_proc.c | 265 ++
1550 drivers/block/drbd/drbd_receiver.c | 4427 ++++++++++++++++++++
1551 drivers/block/drbd/drbd_req.c | 1120 +++++
1552 drivers/block/drbd/drbd_req.h | 326 ++
1553 drivers/block/drbd/drbd_strings.c | 113 +
1554 drivers/block/drbd/drbd_vli.h | 351 ++
1555 drivers/block/drbd/drbd_worker.c | 1512 +++++++
1556 drivers/block/drbd/drbd_wrappers.h | 91 +
1557 drivers/md/dm.c | 16 +-
1558 fs/partitions/check.c | 12 +-
1559 include/linux/blkdev.h | 4 -
1560 include/linux/drbd.h | 350 ++
1561 include/linux/drbd_limits.h | 137 +
1562 include/linux/drbd_nl.h | 137 +
1563 include/linux/drbd_tag_magic.h | 83 +
1564 include/linux/genhd.h | 21 +-
1565 include/linux/lru_cache.h | 294 ++
1566 kernel/sched.c | 3 -
1567 lib/Kconfig | 3 +
1568 lib/Makefile | 2 +
1569 lib/lru_cache.c | 560 +++
1570 mm/backing-dev.c | 2 +-
1571 mm/page-writeback.c | 3 +-
1572 49 files changed, 22321 insertions(+), 1706 deletions(-)
1573 create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg
1574 create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg
1575 create mode 100644 Documentation/blockdev/drbd/README.txt
1576 create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot
1577 create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot
1578 create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot
1579 create mode 100644 Documentation/blockdev/drbd/node-states-8.dot
1580 delete mode 100644 block/as-iosched.c
1581 create mode 100644 drivers/block/drbd/Kconfig
1582 create mode 100644 drivers/block/drbd/Makefile
1583 create mode 100644 drivers/block/drbd/drbd_actlog.c
1584 create mode 100644 drivers/block/drbd/drbd_bitmap.c
1585 create mode 100644 drivers/block/drbd/drbd_int.h
1586 create mode 100644 drivers/block/drbd/drbd_main.c
1587 create mode 100644 drivers/block/drbd/drbd_nl.c
1588 create mode 100644 drivers/block/drbd/drbd_proc.c
1589 create mode 100644 drivers/block/drbd/drbd_receiver.c
1590 create mode 100644 drivers/block/drbd/drbd_req.c
1591 create mode 100644 drivers/block/drbd/drbd_req.h
1592 create mode 100644 drivers/block/drbd/drbd_strings.c
1593 create mode 100644 drivers/block/drbd/drbd_vli.h
1594 create mode 100644 drivers/block/drbd/drbd_worker.c
1595 create mode 100644 drivers/block/drbd/drbd_wrappers.h
1596 create mode 100644 include/linux/drbd.h
1597 create mode 100644 include/linux/drbd_limits.h
1598 create mode 100644 include/linux/drbd_nl.h
1599 create mode 100644 include/linux/drbd_tag_magic.h
1600 create mode 100644 include/linux/lru_cache.h
1601 create mode 100644 lib/lru_cache.c
1602 Merging quilt/device-mapper
1603 $ git merge quilt/device-mapper
1604 Merge made by recursive.
1605 drivers/md/dm-exception-store.c | 64 +++------
1606 drivers/md/dm-exception-store.h | 42 ++++---
1607 drivers/md/dm-ioctl.c | 4 +-
1608 drivers/md/dm-log-userspace-base.c | 2 +-
1609 drivers/md/dm-snap-persistent.c | 99 ++++++++-------
1610 drivers/md/dm-snap-transient.c | 24 ++--
1611 drivers/md/dm-snap.c | 248 +++++++++++++++++++++---------------
1612 drivers/md/dm.c | 11 ++-
1613 8 files changed, 268 insertions(+), 226 deletions(-)
1614 Merging embedded/master
1615 $ git merge embedded/master
1616 Already up-to-date.
1617 Merging firmware/master
1618 $ git merge firmware/master
1619 Already up-to-date.
1620 Merging pcmcia/master
1621 $ git merge pcmcia/master
1622 Already up-to-date.
1623 Merging battery/master
1624 $ git merge battery/master
1625 Already up-to-date.
1626 Merging leds/for-mm
1627 $ git merge leds/for-mm
1628 Merge made by recursive.
1629 drivers/leds/Kconfig | 9 +
1630 drivers/leds/Makefile | 1 +
1631 drivers/leds/leds-ss4200.c | 552 ++++++++++++++++++++++++++++++++++++++++++++
1632 3 files changed, 562 insertions(+), 0 deletions(-)
1633 create mode 100644 drivers/leds/leds-ss4200.c
1634 Merging backlight/for-mm
1635 $ git merge backlight/for-mm
1636 Merge made by recursive.
1637 Documentation/laptops/thinkpad-acpi.txt | 51 +++++++-----------------------
1638 drivers/platform/x86/thinkpad_acpi.c | 24 ++++++++++++++-
1639 drivers/video/backlight/lcd.c | 2 +-
1640 3 files changed, 36 insertions(+), 41 deletions(-)
1641 Merging kgdb/kgdb-next
1642 $ git merge kgdb/kgdb-next
1643 Auto-merging include/linux/sched.h
1644 Auto-merging kernel/softlockup.c
1645 Merge made by recursive.
1646 arch/x86/kernel/kgdb.c | 12 ++++++++----
1647 include/linux/sched.h | 4 ++++
1648 kernel/kgdb.c | 31 +++++++++++++++++++++++--------
1649 kernel/softlockup.c | 16 ++++++++++++++++
1650 4 files changed, 51 insertions(+), 12 deletions(-)
1651 Merging slab/for-next
1652 $ git merge slab/for-next
1653 Auto-merging include/linux/rcupdate.h
1654 Auto-merging init/Kconfig
1655 Auto-merging lib/Kconfig.debug
1656 Auto-merging mm/Makefile
1657 Merge made by recursive.
1658 Documentation/vm/slqbinfo.c | 1047 ++++++++++++
1659 include/linux/rcu_types.h | 18 +
1660 include/linux/rcupdate.h | 11 +-
1661 include/linux/slab.h | 10 +-
1662 include/linux/slqb_def.h | 301 ++++
1663 init/Kconfig | 7 +-
1664 lib/Kconfig.debug | 20 +
1665 mm/Makefile | 1 +
1666 mm/slqb.c | 3791 +++++++++++++++++++++++++++++++++++++++++++
1667 9 files changed, 5193 insertions(+), 13 deletions(-)
1668 create mode 100644 Documentation/vm/slqbinfo.c
1669 create mode 100644 include/linux/rcu_types.h
1670 create mode 100644 include/linux/slqb_def.h
1671 create mode 100644 mm/slqb.c
1672 Merging uclinux/for-next
1673 $ git merge uclinux/for-next
1674 Already up-to-date.
1675 Merging md/for-next
1676 $ git merge md/for-next
1677 Already up-to-date.
1678 Merging mfd/for-next
1679 $ git merge mfd/for-next
1680 Auto-merging drivers/mfd/Makefile
1681 Auto-merging drivers/mfd/asic3.c
1682 Merge made by recursive.
1683 drivers/gpio/adp5520-gpio.c | 36 +-
1684 drivers/gpio/wm831x-gpio.c | 4 +-
1685 drivers/input/keyboard/Kconfig | 10 +
1686 drivers/input/keyboard/Makefile | 1 +
1687 drivers/input/keyboard/adp5520-keys.c | 220 ++++++++++
1688 drivers/mfd/88pm8607.c | 302 +++++++++++++
1689 drivers/mfd/Kconfig | 36 ++-
1690 drivers/mfd/Makefile | 4 +
1691 drivers/mfd/ab3100-core.c | 3 -
1692 drivers/mfd/ab4500-core.c | 208 +++++++++
1693 drivers/mfd/adp5520.c | 378 ++++++++++++++++
1694 drivers/mfd/asic3.c | 2 +-
1695 drivers/mfd/twl4030-core.c | 91 ++--
1696 drivers/mfd/wm831x-core.c | 216 ++++++++--
1697 drivers/mfd/wm8350-core.c | 769 +--------------------------------
1698 drivers/mfd/wm8350-irq.c | 525 ++++++++++++++++++++++
1699 drivers/video/backlight/adp5520_bl.c | 123 +++---
1700 include/linux/mfd/88pm8607.h | 217 ++++++++++
1701 include/linux/mfd/ab4500.h | 262 +++++++++++
1702 include/linux/mfd/adp5520.h | 299 +++++++++++++
1703 include/linux/mfd/wm831x/core.h | 3 +
1704 include/linux/mfd/wm8350/core.h | 4 +-
1705 include/linux/mfd/wm8350/gpio.h | 18 +
1706 23 files changed, 2806 insertions(+), 925 deletions(-)
1707 create mode 100644 drivers/input/keyboard/adp5520-keys.c
1708 create mode 100644 drivers/mfd/88pm8607.c
1709 create mode 100644 drivers/mfd/ab4500-core.c
1710 create mode 100644 drivers/mfd/adp5520.c
1711 create mode 100644 drivers/mfd/wm8350-irq.c
1712 create mode 100644 include/linux/mfd/88pm8607.h
1713 create mode 100644 include/linux/mfd/ab4500.h
1714 create mode 100644 include/linux/mfd/adp5520.h
1715 Merging hdlc/hdlc-next
1716 $ git merge hdlc/hdlc-next
1717 Already up-to-date.
1718 Merging drm/drm-next
1719 $ git merge drm/drm-next
1720 Auto-merging drivers/gpu/drm/radeon/r100.c
1721 Merge made by recursive.
1722 drivers/gpu/drm/radeon/atombios_crtc.c | 266 +++++++++++----------------
1723 drivers/gpu/drm/radeon/r100.c | 2 +-
1724 drivers/gpu/drm/radeon/r600_blit.c | 10 +-
1725 drivers/gpu/drm/radeon/r600_blit_kms.c | 3 +-
1726 drivers/gpu/drm/radeon/radeon_atombios.c | 125 ++++++++-----
1727 drivers/gpu/drm/radeon/radeon_combios.c | 64 +++----
1728 drivers/gpu/drm/radeon/radeon_connectors.c | 77 ++++----
1729 drivers/gpu/drm/radeon/radeon_display.c | 10 +-
1730 drivers/gpu/drm/radeon/radeon_encoders.c | 70 +++-----
1731 drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 37 ++--
1732 drivers/gpu/drm/radeon/radeon_mode.h | 19 +--
1733 11 files changed, 318 insertions(+), 365 deletions(-)
1734 Merging voltage/for-next
1735 $ git merge voltage/for-next
1736 Recorded preimage for 'drivers/mfd/Kconfig'
1737 Recorded preimage for 'drivers/mfd/Makefile'
1738 Auto-merging drivers/mfd/Kconfig
1739 CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
1740 Auto-merging drivers/mfd/Makefile
1741 CONFLICT (content): Merge conflict in drivers/mfd/Makefile
1742 Automatic merge failed; fix conflicts and then commit the result.
1743 $ git commit -v -a
1744 Recorded resolution for 'drivers/mfd/Kconfig'.
1745 Recorded resolution for 'drivers/mfd/Makefile'.
1746 [master e3fdc8d] Merge remote branch 'voltage/for-next'
1747 $ git diff -M --stat --summary HEAD^..
1748 drivers/mfd/Makefile | 2 +-
1749 drivers/regulator/88pm8607.c | 684 +++++++++++++++++++++++++++++++++++++
1750 drivers/regulator/Kconfig | 13 +
1751 drivers/regulator/Makefile | 2 +
1752 drivers/regulator/max8660.c | 510 +++++++++++++++++++++++++++
1753 drivers/regulator/wm831x-dcdc.c | 207 ++++++++++-
1754 include/linux/mfd/wm831x/pdata.h | 17 +
1755 include/linux/regulator/max8660.h | 57 +++
1756 8 files changed, 1473 insertions(+), 19 deletions(-)
1757 create mode 100644 drivers/regulator/88pm8607.c
1758 create mode 100644 drivers/regulator/max8660.c
1759 create mode 100644 include/linux/regulator/max8660.h
1760 Merging security-testing/next
1761 $ git merge security-testing/next
1762 Auto-merging drivers/char/tpm/tpm.c
1763 Removing security/selinux/include/av_inherit.h
1764 Removing security/selinux/include/av_perm_to_string.h
1765 Removing security/selinux/include/av_permissions.h
1766 Removing security/selinux/include/class_to_string.h
1767 Removing security/selinux/include/common_perm_to_string.h
1768 Removing security/selinux/include/flask.h
1769 Merge made by recursive.
1770 drivers/char/tpm/tpm.c | 2 +-
1771 fs/namespace.c | 20 +-
1772 fs/open.c | 27 +-
1773 include/linux/security.h | 41 +
1774 scripts/selinux/Makefile | 4 +-
1775 scripts/selinux/genheaders/Makefile | 5 +
1776 scripts/selinux/genheaders/genheaders.c | 118 +++
1777 scripts/selinux/mdp/mdp.c | 151 +---
1778 security/capability.c | 19 +
1779 security/security.c | 20 +
1780 security/selinux/Makefile | 10 +-
1781 security/selinux/avc.c | 76 +--
1782 security/selinux/hooks.c | 12 +-
1783 security/selinux/include/av_inherit.h | 34 -
1784 security/selinux/include/av_perm_to_string.h | 183 -----
1785 security/selinux/include/av_permissions.h | 870 ----------------------
1786 security/selinux/include/avc_ss.h | 21 +-
1787 security/selinux/include/class_to_string.h | 80 --
1788 security/selinux/include/classmap.h | 150 ++++
1789 security/selinux/include/common_perm_to_string.h | 58 --
1790 security/selinux/include/flask.h | 91 ---
1791 security/selinux/include/security.h | 13 +-
1792 security/selinux/selinuxfs.c | 4 +-
1793 security/selinux/ss/Makefile | 2 +-
1794 security/selinux/ss/mls.c | 2 +-
1795 security/selinux/ss/policydb.c | 47 ++-
1796 security/selinux/ss/policydb.h | 7 +-
1797 security/selinux/ss/services.c | 551 +++++++-------
1798 28 files changed, 787 insertions(+), 1831 deletions(-)
1799 create mode 100644 scripts/selinux/genheaders/Makefile
1800 create mode 100644 scripts/selinux/genheaders/genheaders.c
1801 delete mode 100644 security/selinux/include/av_inherit.h
1802 delete mode 100644 security/selinux/include/av_perm_to_string.h
1803 delete mode 100644 security/selinux/include/av_permissions.h
1804 delete mode 100644 security/selinux/include/class_to_string.h
1805 create mode 100644 security/selinux/include/classmap.h
1806 delete mode 100644 security/selinux/include/common_perm_to_string.h
1807 delete mode 100644 security/selinux/include/flask.h
1808 Merging lblnet/master
1809 $ git merge lblnet/master
1810 Already up-to-date.
1811 Merging agp/agp-next
1812 $ git merge agp/agp-next
1813 Merge made by recursive.
1814 Merging uwb/for-upstream
1815 $ git merge uwb/for-upstream
1816 Already up-to-date.
1817 Merging watchdog/master
1818 $ git merge watchdog/master
1819 Already up-to-date.
1820 Merging bdev/master
1821 $ git merge bdev/master
1822 Already up-to-date.
1823 Merging dwmw2-iommu/master
1824 $ git merge dwmw2-iommu/master
1825 Merge made by recursive.
1826 drivers/pci/dmar.c | 54 +++++++++++++++++++-
1827 drivers/pci/intel-iommu.c | 109 +++++++++++++++++++++++++++++++++++++-----
1828 drivers/pci/intr_remapping.c | 3 +-
1829 include/linux/intel-iommu.h | 1 +
1830 4 files changed, 150 insertions(+), 17 deletions(-)
1831 Merging cputime/cputime
1832 $ git merge cputime/cputime
1833 Already up-to-date.
1834 Merging osd/linux-next
1835 $ git merge osd/linux-next
1836 Auto-merging fs/exofs/super.c
1837 Merge made by recursive.
1838 Documentation/filesystems/00-INDEX | 2 +
1839 Documentation/filesystems/exofs.txt | 23 ++++++------
1840 drivers/scsi/osd/osd_initiator.c | 22 ++++++++---
1841 drivers/scsi/osd/osd_uld.c | 65 +++++++++++++++++++++++++++++++++-
1842 fs/exofs/inode.c | 13 +++++--
1843 fs/exofs/super.c | 11 ++++++
1844 include/scsi/osd_initiator.h | 53 +++++++++++++++++++++++-----
1845 include/scsi/osd_sense.h | 3 ++
1846 8 files changed, 159 insertions(+), 33 deletions(-)
1847 Merging jc_docs/docs-next
1848 $ git merge jc_docs/docs-next
1849 Already up-to-date.
1850 Merging nommu/master
1851 $ git merge nommu/master
1852 Already up-to-date.
1853 Merging trivial/for-next
1854 $ git merge trivial/for-next
1855 Auto-merging drivers/media/dvb/dvb-core/dvb_net.c
1856 Auto-merging drivers/mtd/maps/Kconfig
1857 Auto-merging drivers/net/tokenring/ibmtr.c
1858 Auto-merging drivers/net/wireless/b43/main.c
1859 Auto-merging drivers/net/wireless/b43legacy/main.c
1860 Auto-merging mm/kmemleak.c
1861 Auto-merging mm/memcontrol.c
1862 Auto-merging net/sched/act_api.c
1863 Auto-merging sound/pci/ice1712/juli.c
1864 Merge made by recursive.
1865 Documentation/oops-tracing.txt | 2 ++
1866 Documentation/sysctl/kernel.txt | 6 +++---
1867 Documentation/timers/hpet.txt | 2 +-
1868 arch/arm/mach-s3c2400/Kconfig | 6 ------
1869 arch/arm/mach-s3c2410/Kconfig | 2 --
1870 arch/arm/mach-s3c2412/Kconfig | 4 ----
1871 arch/arm/mach-s3c2440/Kconfig | 3 ---
1872 arch/arm/mach-s3c2442/Kconfig | 4 ----
1873 arch/arm/mach-s3c2443/Kconfig | 2 --
1874 arch/arm/mach-s3c6400/Kconfig | 2 --
1875 arch/arm/mach-s3c6410/Kconfig | 2 --
1876 arch/arm/mach-s5pc100/Kconfig | 2 --
1877 arch/arm/plat-s3c/Kconfig | 2 --
1878 arch/arm/plat-s3c24xx/Kconfig | 2 --
1879 arch/arm/plat-s3c64xx/Kconfig | 2 --
1880 arch/arm/plat-s5pc1xx/Kconfig | 2 --
1881 arch/cris/arch-v10/mm/fault.c | 3 +--
1882 arch/cris/arch-v10/mm/tlb.c | 22 ----------------------
1883 arch/parisc/kernel/perf.c | 2 +-
1884 arch/powerpc/kernel/vdso.c | 2 +-
1885 arch/powerpc/oprofile/op_model_cell.c | 2 +-
1886 drivers/Kconfig | 2 --
1887 drivers/ata/pata_cs5535.c | 2 +-
1888 drivers/block/ataflop.c | 3 ---
1889 drivers/char/tty_ioctl.c | 2 +-
1890 drivers/cpuidle/governor.c | 4 ++--
1891 drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +-
1892 drivers/isdn/act2000/Kconfig | 4 ----
1893 drivers/isdn/capi/Kconfig | 4 ----
1894 drivers/isdn/hysdn/Kconfig | 4 ----
1895 drivers/isdn/i4l/isdn_net.c | 2 +-
1896 drivers/isdn/icn/Kconfig | 4 ----
1897 drivers/isdn/pcbit/Kconfig | 4 ----
1898 drivers/isdn/sc/Kconfig | 4 ----
1899 drivers/md/dm-crypt.c | 2 +-
1900 drivers/media/dvb/dvb-core/dvb_net.c | 2 +-
1901 drivers/media/dvb/frontends/drx397xD.c | 2 +-
1902 drivers/media/video/cx18/cx18-driver.c | 4 ++--
1903 drivers/media/video/cx23885/cx23885-core.c | 4 ++--
1904 drivers/media/video/davinci/dm355_ccdc.c | 4 ++--
1905 drivers/media/video/davinci/dm644x_ccdc.c | 4 ++--
1906 drivers/media/video/ivtv/ivtv-driver.c | 4 ++--
1907 drivers/media/video/ov772x.c | 2 +-
1908 drivers/media/video/saa7134/saa7134-core.c | 4 ++--
1909 drivers/media/video/saa7164/saa7164-core.c | 4 ++--
1910 drivers/mtd/chips/Kconfig | 3 ---
1911 drivers/mtd/devices/Kconfig | 3 ---
1912 drivers/mtd/lpddr/Kconfig | 3 ---
1913 drivers/mtd/maps/Kconfig | 2 --
1914 drivers/mtd/nand/Kconfig | 2 --
1915 drivers/mtd/onenand/Kconfig | 4 ----
1916 drivers/mtd/ubi/Kconfig | 2 --
1917 drivers/net/ps3_gelic_wireless.h | 2 +-
1918 drivers/net/qla3xxx.c | 2 +-
1919 drivers/net/tokenring/ibmtr.c | 2 +-
1920 drivers/net/wireless/b43/main.c | 2 +-
1921 drivers/net/wireless/b43legacy/main.c | 2 +-
1922 drivers/net/wireless/orinoco/hermes_dld.c | 4 ++--
1923 drivers/platform/Kconfig | 2 --
1924 drivers/rtc/rtc-ds1511.c | 4 ++--
1925 drivers/rtc/rtc-stk17ta8.c | 2 +-
1926 drivers/scsi/3w-9xxx.c | 2 +-
1927 drivers/scsi/3w-xxxx.c | 2 +-
1928 drivers/scsi/aic7xxx/aic79xx.seq | 2 +-
1929 drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +-
1930 drivers/scsi/aic7xxx/aic7xxx.seq | 2 +-
1931 drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +-
1932 drivers/scsi/dc395x.c | 2 +-
1933 drivers/scsi/nsp32.c | 2 +-
1934 drivers/uwb/neh.c | 2 +-
1935 drivers/video/atmel_lcdfb.c | 2 +-
1936 drivers/video/omap/lcd_ams_delta.c | 4 ++--
1937 drivers/video/omap/lcd_mipid.c | 4 ++--
1938 drivers/watchdog/sb_wdog.c | 4 ++--
1939 fs/qnx4/bitmap.c | 2 +-
1940 fs/qnx4/dir.c | 6 +++---
1941 fs/qnx4/inode.c | 26 +++++++++++++-------------
1942 fs/qnx4/namei.c | 6 +++---
1943 include/linux/dm-log-userspace.h | 2 +-
1944 include/linux/spi/spi_bitbang.h | 2 +-
1945 kernel/time/clocksource.c | 2 +-
1946 mm/kmemleak.c | 4 ++--
1947 mm/memcontrol.c | 2 +-
1948 net/sched/act_api.c | 2 +-
1949 samples/Kconfig | 3 ---
1950 sound/Kconfig | 4 ----
1951 sound/oss/Kconfig | 2 --
1952 sound/pci/hda/patch_cirrus.c | 2 +-
1953 sound/pci/ice1712/juli.c | 2 +-
1954 89 files changed, 89 insertions(+), 204 deletions(-)
1955 Merging audit/for-next
1956 $ git merge audit/for-next
1957 Already up-to-date.
1958 Merging omap/for-next
1959 $ git merge omap/for-next
1960 Merge made by recursive.
1961 arch/arm/mach-omap1/board-fsample.c | 18 +-
1962 arch/arm/mach-omap1/board-perseus2.c | 18 +-
1963 arch/arm/mach-omap1/clock.c | 24 +-
1964 arch/arm/mach-omap1/io.c | 45 +---
1965 arch/arm/mach-omap1/irq.c | 32 +---
1966 arch/arm/mach-omap1/mcbsp.c | 32 ++--
1967 arch/arm/mach-omap1/mux.c | 70 ++-----
1968 arch/arm/mach-omap1/pm.c | 100 +++++-----
1969 arch/arm/mach-omap1/pm.h | 53 +++---
1970 arch/arm/mach-omap1/serial.c | 15 +-
1971 arch/arm/mach-omap1/sleep.S | 22 +-
1972 arch/arm/mach-omap2/board-2430sdp.c | 2 +-
1973 arch/arm/mach-omap2/board-3430sdp.c | 2 +-
1974 arch/arm/mach-omap2/board-4430sdp.c | 6 +-
1975 arch/arm/mach-omap2/board-apollon.c | 2 +-
1976 arch/arm/mach-omap2/board-generic.c | 2 +-
1977 arch/arm/mach-omap2/board-h4.c | 2 +-
1978 arch/arm/mach-omap2/board-ldp.c | 2 +-
1979 arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
1980 arch/arm/mach-omap2/board-omap3evm.c | 2 +-
1981 arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
1982 arch/arm/mach-omap2/board-overo.c | 2 +-
1983 arch/arm/mach-omap2/board-rx51.c | 2 +-
1984 arch/arm/mach-omap2/board-zoom2.c | 2 +-
1985 arch/arm/mach-omap2/cm.h | 6 +-
1986 arch/arm/mach-omap2/id.c | 135 +++++++++++--
1987 arch/arm/mach-omap2/io.c | 18 ++
1988 arch/arm/mach-omap2/irq.c | 4 +-
1989 arch/arm/mach-omap2/omap-smp.c | 2 +-
1990 arch/arm/mach-omap2/omap_hwmod.c | 18 +-
1991 arch/arm/mach-omap2/pm-debug.c | 3 +-
1992 arch/arm/mach-omap2/prm.h | 6 +-
1993 arch/arm/mach-omap2/sdrc.h | 9 +-
1994 arch/arm/mach-omap2/serial.c | 16 +-
1995 arch/arm/mach-omap2/sram242x.S | 4 +-
1996 arch/arm/mach-omap2/sram243x.S | 4 +-
1997 arch/arm/mach-omap2/timer-gp.c | 2 +-
1998 arch/arm/plat-omap/common.c | 44 ++--
1999 arch/arm/plat-omap/devices.c | 22 +-
2000 arch/arm/plat-omap/dma.c | 6 +-
2001 arch/arm/plat-omap/dmtimer.c | 2 +-
2002 arch/arm/plat-omap/gpio.c | 269 ++++++++-----------------
2003 arch/arm/plat-omap/include/mach/control.h | 49 ++++-
2004 arch/arm/plat-omap/include/mach/cpu.h | 66 ++++++
2005 arch/arm/plat-omap/include/mach/debug-macro.S | 4 +-
2006 arch/arm/plat-omap/include/mach/entry-macro.S | 12 +-
2007 arch/arm/plat-omap/include/mach/hardware.h | 2 +-
2008 arch/arm/plat-omap/include/mach/io.h | 124 ++++++++----
2009 arch/arm/plat-omap/include/mach/irqs.h | 229 +++++++--------------
2010 arch/arm/plat-omap/include/mach/mcbsp.h | 6 +-
2011 arch/arm/plat-omap/include/mach/mux.h | 100 +++-------
2012 arch/arm/plat-omap/include/mach/omap44xx.h | 14 +-
2013 arch/arm/plat-omap/include/mach/omap7xx.h | 104 ++++++++++
2014 arch/arm/plat-omap/include/mach/sdrc.h | 6 +-
2015 arch/arm/plat-omap/include/mach/serial.h | 4 -
2016 arch/arm/plat-omap/include/mach/uncompress.h | 3 +-
2017 arch/arm/plat-omap/include/mach/vmalloc.h | 2 +-
2018 arch/arm/plat-omap/io.c | 34 ++--
2019 arch/arm/plat-omap/omap_device.c | 50 ++---
2020 arch/arm/plat-omap/sram.c | 24 +-
2021 arch/arm/plat-omap/usb.c | 10 +-
2022 drivers/spi/omap_uwire.c | 8 +-
2023 drivers/video/omap/dispc.c | 6 +-
2024 63 files changed, 984 insertions(+), 902 deletions(-)
2025 create mode 100644 arch/arm/plat-omap/include/mach/omap7xx.h
2026 Merging quilt/aoe
2027 $ git merge quilt/aoe
2028 Merge made by recursive.
2029 drivers/block/aoe/aoecmd.c | 8 ++++++--
2030 1 files changed, 6 insertions(+), 2 deletions(-)
2031 Merging suspend/linux-next
2032 $ git merge suspend/linux-next
2033 Auto-merging drivers/pci/pci.c
2034 Removing kernel/power/swsusp.c
2035 Merge made by recursive.
2036 drivers/acpi/glue.c | 3 +
2037 drivers/acpi/scan.c | 1 +
2038 drivers/base/core.c | 4 +
2039 drivers/base/power/Makefile | 2 +-
2040 drivers/base/power/common.c | 283 ++++++++++++++++
2041 drivers/base/power/main.c | 677 ++++++++++++++++++++++++++++++++++++---
2042 drivers/base/power/power.h | 42 ++-
2043 drivers/base/power/runtime.c | 4 -
2044 drivers/base/power/sysfs.c | 47 +++
2045 drivers/pci/pci.c | 1 +
2046 drivers/pci/pcie/portdrv_core.c | 1 +
2047 include/linux/device.h | 11 +
2048 include/linux/pm.h | 13 +-
2049 include/linux/pm_link.h | 30 ++
2050 include/linux/resume-trace.h | 7 +
2051 kernel/power/Kconfig | 14 +
2052 kernel/power/Makefile | 2 +-
2053 kernel/power/hibernate.c | 37 ++-
2054 kernel/power/main.c | 31 ++-
2055 kernel/power/process.c | 14 +-
2056 kernel/power/swap.c | 109 ++++++-
2057 kernel/power/swsusp.c | 188 -----------
2058 22 files changed, 1250 insertions(+), 271 deletions(-)
2059 create mode 100644 drivers/base/power/common.c
2060 create mode 100644 include/linux/pm_link.h
2061 delete mode 100644 kernel/power/swsusp.c
2062 Merging bluetooth/master
2063 $ git merge bluetooth/master
2064 Already up-to-date.
2065 Merging fsnotify/for-next
2066 $ git merge fsnotify/for-next
2067 Auto-merging Documentation/feature-removal-schedule.txt
2068 Auto-merging fs/compat.c
2069 Auto-merging fs/exec.c
2070 Auto-merging fs/nfsd/vfs.c
2071 Auto-merging fs/open.c
2072 Auto-merging fs/read_write.c
2073 Auto-merging init/Kconfig
2074 Auto-merging kernel/Makefile
2075 Auto-merging kernel/audit.c
2076 Auto-merging kernel/audit_watch.c
2077 Auto-merging kernel/auditsc.c
2078 Merge made by recursive.
2079 Documentation/feature-removal-schedule.txt | 7 +
2080 fs/compat.c | 5 +-
2081 fs/exec.c | 4 +-
2082 fs/nfsd/vfs.c | 4 +-
2083 fs/notify/dnotify/dnotify.c | 8 +-
2084 fs/notify/fsnotify.c | 16 ++-
2085 fs/notify/group.c | 50 +-----
2086 fs/notify/inode_mark.c | 24 ++-
2087 fs/notify/inotify/inotify_fsnotify.c | 59 ++++++-
2088 fs/notify/inotify/inotify_user.c | 219 ++++++++++++++-------
2089 fs/notify/notification.c | 161 +++++++++-------
2090 fs/open.c | 2 +-
2091 fs/read_write.c | 8 +-
2092 include/linux/fsnotify.h | 44 +++--
2093 include/linux/fsnotify_backend.h | 30 ++--
2094 init/Kconfig | 10 +-
2095 kernel/Makefile | 5 +-
2096 kernel/audit.c | 1 -
2097 kernel/audit.h | 26 ++-
2098 kernel/audit_tree.c | 223 ++++++++++++----------
2099 kernel/audit_watch.c | 294 ++++++++++++++++------------
2100 kernel/auditfilter.c | 39 ++---
2101 kernel/auditsc.c | 9 +-
2102 23 files changed, 726 insertions(+), 522 deletions(-)
2103 Merging irda/for-next
2104 $ git merge irda/for-next
2105 Auto-merging drivers/net/irda/irda-usb.c
2106 Merge made by recursive.
2107 drivers/net/irda/irda-usb.c | 9 +++++----
2108 1 files changed, 5 insertions(+), 4 deletions(-)
2109 Merging hwlat/for-linus
2110 $ git merge hwlat/for-linus
2111 Auto-merging MAINTAINERS
2112 Auto-merging drivers/misc/Kconfig
2113 Auto-merging drivers/misc/Makefile
2114 Merge made by recursive.
2115 Documentation/hwlat_detector.txt | 64 ++
2116 MAINTAINERS | 9 +
2117 drivers/misc/Kconfig | 29 +
2118 drivers/misc/Makefile | 1 +
2119 drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++
2120 5 files changed, 1311 insertions(+), 0 deletions(-)
2121 create mode 100644 Documentation/hwlat_detector.txt
2122 create mode 100644 drivers/misc/hwlat_detector.c
2123 Merging drbd/for-jens
2124 $ git merge drbd/for-jens
2125 Resolved 'drivers/block/drbd/Kconfig' using previous resolution.
2126 Resolved 'drivers/block/drbd/Makefile' using previous resolution.
2127 Resolved 'drivers/block/drbd/drbd_actlog.c' using previous resolution.
2128 Resolved 'drivers/block/drbd/drbd_int.h' using previous resolution.
2129 Resolved 'drivers/block/drbd/drbd_main.c' using previous resolution.
2130 Resolved 'drivers/block/drbd/drbd_nl.c' using previous resolution.
2131 Resolved 'drivers/block/drbd/drbd_receiver.c' using previous resolution.
2132 Resolved 'drivers/block/drbd/drbd_req.c' using previous resolution.
2133 Resolved 'drivers/block/drbd/drbd_worker.c' using previous resolution.
2134 Resolved 'include/linux/drbd.h' using previous resolution.
2135 Auto-merging MAINTAINERS
2136 Auto-merging drivers/block/drbd/Kconfig
2137 CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
2138 Auto-merging drivers/block/drbd/Makefile
2139 CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
2140 Auto-merging drivers/block/drbd/drbd_actlog.c
2141 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
2142 Auto-merging drivers/block/drbd/drbd_int.h
2143 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
2144 Auto-merging drivers/block/drbd/drbd_main.c
2145 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
2146 Auto-merging drivers/block/drbd/drbd_nl.c
2147 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
2148 Auto-merging drivers/block/drbd/drbd_receiver.c
2149 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
2150 Auto-merging drivers/block/drbd/drbd_req.c
2151 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
2152 Auto-merging drivers/block/drbd/drbd_worker.c
2153 CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
2154 Auto-merging include/linux/drbd.h
2155 CONFLICT (add/add): Merge conflict in include/linux/drbd.h
2156 Automatic merge failed; fix conflicts and then commit the result.
2157 $ git commit -v -a
2158 [master c53f1fc] Merge remote branch 'drbd/for-jens'
2159 $ git diff -M --stat --summary HEAD^..
2160 drivers/block/drbd/drbd_tracing.c | 752 +++++++++++++++++++++++++++++++++++++
2161 drivers/block/drbd/drbd_tracing.h | 87 +++++
2162 2 files changed, 839 insertions(+), 0 deletions(-)
2163 create mode 100644 drivers/block/drbd/drbd_tracing.c
2164 create mode 100644 drivers/block/drbd/drbd_tracing.h
2165 Merging catalin/for-next
2166 $ git merge catalin/for-next
2167 Already up-to-date.
2168 Merging alacrity/linux-next
2169 $ git merge alacrity/linux-next
2170 Resolved 'lib/Kconfig' using previous resolution.
2171 Auto-merging MAINTAINERS
2172 Auto-merging arch/x86/Kconfig
2173 Auto-merging include/linux/Kbuild
2174 Auto-merging lib/Kconfig
2175 CONFLICT (content): Merge conflict in lib/Kconfig
2176 Auto-merging lib/Makefile
2177 Automatic merge failed; fix conflicts and then commit the result.
2178 $ git commit -v -a
2179 [master a4f808c] Merge remote branch 'alacrity/linux-next'
2180 $ git diff -M --stat --summary HEAD^..
2181 MAINTAINERS | 18 +
2182 arch/x86/Kconfig | 2 +
2183 drivers/Makefile | 1 +
2184 drivers/vbus/Kconfig | 25 ++
2185 drivers/vbus/Makefile | 6 +
2186 drivers/vbus/bus-proxy.c | 216 ++++++++++
2187 drivers/vbus/pci-bridge.c | 954 +++++++++++++++++++++++++++++++++++++++++++
2188 include/linux/Kbuild | 3 +
2189 include/linux/ioq.h | 415 +++++++++++++++++++
2190 include/linux/shm_signal.h | 189 +++++++++
2191 include/linux/vbus_driver.h | 80 ++++
2192 include/linux/vbus_pci.h | 145 +++++++
2193 lib/Kconfig | 21 +
2194 lib/Makefile | 2 +
2195 lib/ioq.c | 296 ++++++++++++++
2196 lib/shm_signal.c | 192 +++++++++
2197 16 files changed, 2565 insertions(+), 0 deletions(-)
2198 create mode 100644 drivers/vbus/Kconfig
2199 create mode 100644 drivers/vbus/Makefile
2200 create mode 100644 drivers/vbus/bus-proxy.c
2201 create mode 100644 drivers/vbus/pci-bridge.c
2202 create mode 100644 include/linux/ioq.h
2203 create mode 100644 include/linux/shm_signal.h
2204 create mode 100644 include/linux/vbus_driver.h
2205 create mode 100644 include/linux/vbus_pci.h
2206 create mode 100644 lib/ioq.c
2207 create mode 100644 lib/shm_signal.c
2208 Merging i7core_edac/linux_next
2209 $ git merge i7core_edac/linux_next
2210 Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
2211 CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
2212 Auto-merging drivers/edac/Kconfig
2213 Auto-merging drivers/edac/Makefile
2214 CONFLICT (content): Merge conflict in drivers/edac/Makefile
2215 Auto-merging include/linux/pci.h
2216 Auto-merging include/linux/pci_ids.h
2217 Automatic merge failed; fix conflicts and then commit the result.
2218 $ git reset --hard
2219 HEAD is now at a4f808c Merge remote branch 'alacrity/linux-next'
2220 Merging tip/auto-latest
2221 $ git merge tip/auto-latest
2222 Auto-merging Documentation/feature-removal-schedule.txt
2223 Auto-merging arch/x86/Kconfig
2224 Auto-merging drivers/pci/intr_remapping.c
2225 Auto-merging include/linux/kernel.h
2226 Auto-merging kernel/sched.c
2227 Auto-merging kernel/trace/trace.c
2228 Removing tools/perf/util/module.c
2229 Removing tools/perf/util/module.h
2230 Merge made by recursive.
2231 Documentation/feature-removal-schedule.txt | 30 +
2232 arch/x86/Kconfig | 16 +-
2233 arch/x86/Kconfig.cpu | 2 +-
2234 arch/x86/Kconfig.debug | 14 +
2235 arch/x86/Makefile_32.cpu | 2 +-
2236 arch/x86/include/asm/cmpxchg_32.h | 218 +++-----
2237 arch/x86/include/asm/cmpxchg_64.h | 234 +++-----
2238 arch/x86/include/asm/hpet.h | 7 +-
2239 arch/x86/include/asm/msr.h | 4 +-
2240 arch/x86/include/asm/perf_event.h | 13 +-
2241 arch/x86/include/asm/string_32.h | 9 +
2242 arch/x86/include/asm/uaccess_32.h | 27 +-
2243 arch/x86/include/asm/uaccess_64.h | 19 +-
2244 arch/x86/kernel/acpi/boot.c | 1 +
2245 arch/x86/kernel/apic/io_apic.c | 49 ++-
2246 arch/x86/kernel/cpu/perf_event.c | 185 ++++++-
2247 arch/x86/kernel/cpuid.c | 17 +-
2248 arch/x86/kernel/ftrace.c | 8 +-
2249 arch/x86/kernel/hpet.c | 60 ++-
2250 arch/x86/kernel/irq.c | 2 -
2251 arch/x86/kernel/msr.c | 16 +-
2252 arch/x86/kernel/smp.c | 1 -
2253 arch/x86/kernel/tsc.c | 8 +-
2254 arch/x86/kernel/vmi_32.c | 2 +-
2255 arch/x86/kernel/x8664_ksyms_64.c | 2 +-
2256 arch/x86/lib/copy_user_64.S | 4 +-
2257 arch/x86/lib/msr.c | 46 +-
2258 arch/x86/lib/usercopy_32.c | 10 +-
2259 arch/x86/mm/testmmiotrace.c | 29 +-
2260 drivers/pci/intr_remapping.c | 89 +++-
2261 drivers/pci/intr_remapping.h | 7 +
2262 fs/proc/array.c | 11 +
2263 include/linux/clocksource.h | 1 -
2264 include/linux/compiler-gcc4.h | 6 +
2265 include/linux/compiler.h | 11 +
2266 include/linux/dmar.h | 10 +
2267 include/linux/hpet.h | 2 +
2268 include/linux/kernel.h | 2 -
2269 include/linux/net.h | 1 +
2270 include/linux/poison.h | 16 +-
2271 include/linux/ratelimit.h | 30 +-
2272 include/linux/smp_lock.h | 21 +-
2273 include/linux/timex.h | 9 +-
2274 include/trace/events/bkl.h | 61 ++
2275 include/trace/ftrace.h | 15 +-
2276 kernel/cpuset.c | 8 +-
2277 kernel/irq/manage.c | 2 +-
2278 kernel/lockdep.c | 20 +-
2279 kernel/printk.c | 1 +
2280 kernel/sched.c | 12 +-
2281 kernel/sysctl.c | 3 +
2282 kernel/time.c | 1 -
2283 kernel/time/timekeeping.c | 108 ++--
2284 kernel/trace/ftrace.c | 64 +--
2285 kernel/trace/ring_buffer.c | 15 +-
2286 kernel/trace/trace.c | 2 +-
2287 kernel/trace/trace.h | 36 +-
2288 kernel/trace/trace_events.c | 47 +-
2289 kernel/trace/trace_events_filter.c | 155 +++++-
2290 kernel/trace/trace_export.c | 25 +-
2291 kernel/trace/trace_syscalls.c | 20 +-
2292 lib/kernel_lock.c | 20 +-
2293 lib/ratelimit.c | 39 +-
2294 net/core/sysctl_net_core.c | 2 +
2295 net/core/utils.c | 2 +
2296 tools/perf/Makefile | 10 +-
2297 tools/perf/builtin-annotate.c | 501 ++---------------
2298 tools/perf/builtin-record.c | 59 +-
2299 tools/perf/builtin-report.c | 840 +++-------------------------
2300 tools/perf/builtin-sched.c | 181 ++-----
2301 tools/perf/builtin-top.c | 127 ++---
2302 tools/perf/builtin-trace.c | 153 +-----
2303 tools/perf/util/cache.h | 6 +-
2304 tools/perf/util/callchain.h | 2 +-
2305 tools/perf/util/color.h | 6 +-
2306 tools/perf/util/data_map.c | 222 ++++++++
2307 tools/perf/util/data_map.h | 31 +
2308 tools/perf/util/debug.h | 4 +
2309 tools/perf/util/event.h | 15 +-
2310 tools/perf/util/exec_cmd.h | 6 +-
2311 tools/perf/util/header.c | 50 ++-
2312 tools/perf/util/header.h | 10 +-
2313 tools/perf/util/help.h | 6 +-
2314 tools/perf/util/hist.c | 210 +++++++
2315 tools/perf/util/hist.h | 50 ++
2316 tools/perf/util/levenshtein.h | 6 +-
2317 tools/perf/util/module.c | 545 ------------------
2318 tools/perf/util/module.h | 53 --
2319 tools/perf/util/parse-events.h | 6 +-
2320 tools/perf/util/parse-options.h | 6 +-
2321 tools/perf/util/quote.h | 6 +-
2322 tools/perf/util/run-command.h | 6 +-
2323 tools/perf/util/sigchain.h | 6 +-
2324 tools/perf/util/sort.c | 276 +++++++++
2325 tools/perf/util/sort.h | 90 +++
2326 tools/perf/util/strbuf.h | 6 +-
2327 tools/perf/util/string.c | 11 +
2328 tools/perf/util/string.h | 7 +-
2329 tools/perf/util/strlist.h | 6 +-
2330 tools/perf/util/svghelper.h | 6 +-
2331 tools/perf/util/symbol.c | 721 ++++++++++++++++++------
2332 tools/perf/util/symbol.h | 24 +-
2333 tools/perf/util/thread.c | 129 +++--
2334 tools/perf/util/thread.h | 21 +-
2335 tools/perf/util/trace-event-info.c | 6 +-
2336 tools/perf/util/trace-event-parse.c | 60 ++-
2337 tools/perf/util/trace-event-read.c | 7 +-
2338 tools/perf/util/trace-event.h | 16 +-
2339 tools/perf/util/types.h | 6 +-
2340 tools/perf/util/values.h | 6 +-
2341 110 files changed, 3234 insertions(+), 3196 deletions(-)
2342 create mode 100644 include/trace/events/bkl.h
2343 create mode 100644 tools/perf/util/data_map.c
2344 create mode 100644 tools/perf/util/data_map.h
2345 create mode 100644 tools/perf/util/hist.c
2346 create mode 100644 tools/perf/util/hist.h
2347 delete mode 100644 tools/perf/util/module.c
2348 delete mode 100644 tools/perf/util/module.h
2349 create mode 100644 tools/perf/util/sort.c
2350 create mode 100644 tools/perf/util/sort.h
2351 Merging oprofile/for-next
2352 $ git merge oprofile/for-next
2353 Already up-to-date.
2354 Merging percpu/for-next
2355 $ git merge percpu/for-next
2356 Auto-merging kernel/rcutorture.c
2357 Auto-merging kernel/trace/trace.c
2358 Auto-merging kernel/trace/trace.h
2359 Auto-merging mm/Makefile
2360 Removing mm/allocpercpu.c
2361 Merge made by recursive.
2362 arch/ia64/Kconfig | 3 -
2363 arch/ia64/include/asm/meminit.h | 2 +-
2364 arch/ia64/include/asm/pgtable.h | 3 +-
2365 arch/ia64/kernel/acpi.c | 33 ++--
2366 arch/ia64/kernel/setup.c | 23 +--
2367 arch/ia64/kernel/vmlinux.lds.S | 11 +-
2368 arch/ia64/mm/contig.c | 99 ++++++--
2369 arch/ia64/mm/discontig.c | 124 +++++++++-
2370 arch/ia64/mm/init.c | 4 +-
2371 arch/sparc/kernel/nmi.c | 8 +-
2372 arch/x86/include/asm/percpu.h | 78 ++++++
2373 arch/x86/kernel/apic/nmi.c | 8 +-
2374 crypto/cryptd.c | 2 +-
2375 drivers/dma/dmaengine.c | 36 +--
2376 drivers/infiniband/hw/ehca/ehca_irq.c | 3 +-
2377 drivers/net/chelsio/sge.c | 5 +-
2378 drivers/net/loopback.c | 2 +-
2379 drivers/net/veth.c | 7 +-
2380 fs/ext4/mballoc.c | 2 +-
2381 fs/nfs/iostat.h | 24 +--
2382 fs/xfs/xfs_mount.c | 12 +-
2383 include/asm-generic/percpu.h | 5 +
2384 include/linux/percpu.h | 424 +++++++++++++++++++++++++++++++--
2385 include/linux/vmstat.h | 10 +-
2386 include/net/neighbour.h | 7 +-
2387 include/net/netfilter/nf_conntrack.h | 4 +-
2388 include/net/snmp.h | 50 ++---
2389 kernel/module.c | 150 ------------
2390 kernel/rcutorture.c | 8 +-
2391 kernel/trace/trace.c | 8 +-
2392 kernel/trace/trace.h | 2 +-
2393 mm/Makefile | 4 -
2394 mm/allocpercpu.c | 177 --------------
2395 mm/percpu.c | 7 +-
2396 34 files changed, 780 insertions(+), 565 deletions(-)
2397 delete mode 100644 mm/allocpercpu.c
2398 $ git reset --hard HEAD^
2399 HEAD is now at 1c8a7d9 Merge remote branch 'tip/auto-latest'
2400 Merging refs/next/20091012/percpu
2401 $ git merge refs/next/20091012/percpu
2402 Auto-merging kernel/rcutorture.c
2403 Auto-merging mm/Makefile
2404 Removing mm/allocpercpu.c
2405 Merge made by recursive.
2406 arch/ia64/Kconfig | 3 -
2407 arch/ia64/include/asm/meminit.h | 2 +-
2408 arch/ia64/include/asm/pgtable.h | 3 +-
2409 arch/ia64/kernel/acpi.c | 33 ++--
2410 arch/ia64/kernel/setup.c | 23 +--
2411 arch/ia64/kernel/vmlinux.lds.S | 11 +-
2412 arch/ia64/mm/contig.c | 99 ++++++--
2413 arch/ia64/mm/discontig.c | 124 +++++++++-
2414 arch/ia64/mm/init.c | 4 +-
2415 arch/x86/include/asm/percpu.h | 78 ++++++
2416 crypto/cryptd.c | 2 +-
2417 drivers/dma/dmaengine.c | 36 +--
2418 drivers/infiniband/hw/ehca/ehca_irq.c | 3 +-
2419 drivers/net/chelsio/sge.c | 5 +-
2420 drivers/net/loopback.c | 2 +-
2421 drivers/net/veth.c | 7 +-
2422 fs/ext4/mballoc.c | 2 +-
2423 fs/nfs/iostat.h | 24 +--
2424 fs/xfs/xfs_mount.c | 12 +-
2425 include/asm-generic/percpu.h | 5 +
2426 include/linux/percpu.h | 424 +++++++++++++++++++++++++++++++--
2427 include/linux/vmstat.h | 10 +-
2428 include/net/neighbour.h | 7 +-
2429 include/net/netfilter/nf_conntrack.h | 4 +-
2430 include/net/snmp.h | 50 ++---
2431 kernel/module.c | 150 ------------
2432 kernel/rcutorture.c | 8 +-
2433 mm/Makefile | 4 -
2434 mm/allocpercpu.c | 177 --------------
2435 mm/percpu.c | 7 +-
2436 30 files changed, 767 insertions(+), 552 deletions(-)
2437 delete mode 100644 mm/allocpercpu.c
2438 Merging sfi/sfi-test
2439 $ git merge sfi/sfi-test
2440 Already up-to-date.
2441 Merging asm-generic/next
2442 $ git merge asm-generic/next
2443 Merge made by recursive.
2444 lib/checksum.c | 14 ++++++++------
2445 1 files changed, 8 insertions(+), 6 deletions(-)
2446 Merging hwpoison/hwpoison
2447 $ git merge hwpoison/hwpoison
2448 Already up-to-date.
2449 Merging quilt/driver-core
2450 $ git merge quilt/driver-core
2451 Already up-to-date.
2452 Merging quilt/tty
2453 $ git merge quilt/tty
2454 Removing Documentation/serial/hayes-esp.txt
2455 Removing drivers/char/esp.c
2456 Removing include/linux/hayesesp.h
2457 Merge made by recursive.
2458 Documentation/serial/hayes-esp.txt | 154 --
2459 arch/xtensa/platforms/iss/console.c | 2 +-
2460 drivers/char/Kconfig | 13 -
2461 drivers/char/Makefile | 1 -
2462 drivers/char/bfin_jtag_comm.c | 2 +-
2463 drivers/char/epca.c | 2 +-
2464 drivers/char/esp.c | 2533 ----------------------------------
2465 drivers/char/pcmcia/ipwireless/tty.c | 2 +-
2466 drivers/serial/jsm/jsm.h | 8 -
2467 drivers/serial/jsm/jsm_driver.c | 2 +-
2468 drivers/serial/jsm/jsm_neo.c | 8 -
2469 drivers/serial/jsm/jsm_tty.c | 4 +-
2470 include/linux/hayesesp.h | 114 --
2471 13 files changed, 6 insertions(+), 2839 deletions(-)
2472 delete mode 100644 Documentation/serial/hayes-esp.txt
2473 delete mode 100644 drivers/char/esp.c
2474 delete mode 100644 include/linux/hayesesp.h
2475 Merging quilt/usb
2476 $ git merge quilt/usb
2477 Merge made by recursive.
2478 Documentation/powerpc/dts-bindings/xilinx.txt | 11 +
2479 drivers/usb/core/generic.c | 2 +-
2480 drivers/usb/core/message.c | 8 +-
2481 drivers/usb/core/urb.c | 22 ++-
2482 drivers/usb/host/Kconfig | 15 +-
2483 drivers/usb/host/ehci-hcd.c | 5 +
2484 drivers/usb/host/ehci-hub.c | 2 +-
2485 drivers/usb/host/ehci-xilinx-of.c | 300 +++++++++++++++++++++
2486 drivers/usb/host/ohci-pnx4008.c | 8 +-
2487 drivers/usb/host/whci/hcd.c | 1 +
2488 drivers/usb/host/whci/qset.c | 348 ++++++++++++++++++++++--
2489 drivers/usb/host/whci/whcd.h | 9 +
2490 drivers/usb/host/whci/whci-hc.h | 5 +-
2491 drivers/usb/host/xhci-pci.c | 2 +
2492 drivers/usb/serial/ftdi_sio.c | 18 +-
2493 drivers/usb/storage/scsiglue.c | 3 +-
2494 drivers/usb/storage/usb.c | 25 ++-
2495 drivers/usb/storage/usb.h | 1 +
2496 include/linux/usb.h | 1 +
2497 19 files changed, 724 insertions(+), 62 deletions(-)
2498 create mode 100644 drivers/usb/host/ehci-xilinx-of.c
2499 Merging quilt/staging
2500 $ git merge quilt/staging
2501 Removing drivers/staging/android/Kconfig
2502 Removing drivers/staging/android/Makefile
2503 Removing drivers/staging/android/TODO
2504 Removing drivers/staging/android/binder.c
2505 Removing drivers/staging/android/binder.h
2506 Removing drivers/staging/android/logger.c
2507 Removing drivers/staging/android/logger.h
2508 Removing drivers/staging/android/lowmemorykiller.c
2509 Removing drivers/staging/android/ram_console.c
2510 Removing drivers/staging/android/timed_gpio.c
2511 Removing drivers/staging/android/timed_gpio.h
2512 Removing drivers/staging/android/timed_output.c
2513 Removing drivers/staging/android/timed_output.h
2514 Removing drivers/staging/rt2860/2860_main_dev.c
2515 Removing drivers/staging/rt2860/aironet.h
2516 Removing drivers/staging/rt2860/common/2860_rtmp_init.c
2517 Removing drivers/staging/rt2860/common/cmm_data_2860.c
2518 Removing drivers/staging/rt2860/common/md5.c
2519 Removing drivers/staging/rt2860/common/rtmp_tkip.c
2520 Removing drivers/staging/rt2860/common/rtmp_wep.c
2521 Removing drivers/staging/rt2860/config.mk
2522 Removing drivers/staging/rt2860/md5.h
2523 Removing drivers/staging/rt2860/rt2860.h
2524 Removing drivers/staging/rt2860/sta/aironet.c
2525 Removing drivers/staging/rt2870/2870_main_dev.c
2526 Removing drivers/staging/rt2870/common/2870_rtmp_init.c
2527 Removing drivers/staging/rt2870/rt2870.h
2528 Removing drivers/staging/rt3090/Kconfig
2529 Removing drivers/staging/rt3090/Makefile
2530 Removing drivers/staging/rt3090/action.h
2531 Removing drivers/staging/rt3090/ap.h
2532 Removing drivers/staging/rt3090/ap_apcli.h
2533 Removing drivers/staging/rt3090/ap_autoChSel.h
2534 Removing drivers/staging/rt3090/ap_autoChSel_cmm.h
2535 Removing drivers/staging/rt3090/ap_cfg.h
2536 Removing drivers/staging/rt3090/ap_ids.h
2537 Removing drivers/staging/rt3090/ap_mbss.h
2538 Removing drivers/staging/rt3090/ap_uapsd.h
2539 Removing drivers/staging/rt3090/ap_wds.h
2540 Removing drivers/staging/rt3090/chips/rt3370.c
2541 Removing drivers/staging/rt3090/chips/rt3390.c
2542 Removing drivers/staging/rt3090/chips/rt33xx.c
2543 Removing drivers/staging/rt3090/chlist.h
2544 Removing drivers/staging/rt3090/common/action.c
2545 Removing drivers/staging/rt3090/common/ba_action.c
2546 Removing drivers/staging/rt3090/common/cmm_data.c
2547 Removing drivers/staging/rt3090/common/cmm_info.c
2548 Removing drivers/staging/rt3090/common/cmm_sanity.c
2549 Removing drivers/staging/rt3090/common/cmm_sync.c
2550 Removing drivers/staging/rt3090/common/cmm_wpa.c
2551 Removing drivers/staging/rt3090/common/crypt_aes.c
2552 Removing drivers/staging/rt3090/common/crypt_biginteger.c
2553 Removing drivers/staging/rt3090/common/crypt_dh.c
2554 Removing drivers/staging/rt3090/common/dfs.c
2555 Removing drivers/staging/rt3090/common/eeprom.c
2556 Removing drivers/staging/rt3090/common/igmp_snoop.c
2557 Removing drivers/staging/rt3090/common/mlme.c
2558 Removing drivers/staging/rt3090/common/mlme_ex.c
2559 Removing drivers/staging/rt3090/common/netif_block.c
2560 Removing drivers/staging/rt3090/common/rtmp_init.c
2561 Removing drivers/staging/rt3090/common/rtmp_mcu.c
2562 Removing drivers/staging/rt3090/common/spectrum.c
2563 Removing drivers/staging/rt3090/config.mk
2564 Removing drivers/staging/rt3090/dfs.h
2565 Removing drivers/staging/rt3090/igmp_snoop.h
2566 Removing drivers/staging/rt3090/ipv6.h
2567 Removing drivers/staging/rt3090/link_list.h
2568 Removing drivers/staging/rt3090/mlme.h
2569 Removing drivers/staging/rt3090/mlme_ex.h
2570 Removing drivers/staging/rt3090/mlme_ex_def.h
2571 Removing drivers/staging/rt3090/oid.h
2572 Removing drivers/staging/rt3090/rt3390.h
2573 Removing drivers/staging/rt3090/rt_ate.c
2574 Removing drivers/staging/rt3090/rt_ate.h
2575 Removing drivers/staging/rt3090/rt_config.h
2576 Removing drivers/staging/rt3090/rt_linux.c
2577 Removing drivers/staging/rt3090/rt_linux.h
2578 Removing drivers/staging/rt3090/rt_main_dev.c
2579 Removing drivers/staging/rt3090/rt_profile.c
2580 Removing drivers/staging/rt3090/rtmp.h
2581 Removing drivers/staging/rt3090/rtmp_def.h
2582 Removing drivers/staging/rt3090/rtmp_mac.h
2583 Removing drivers/staging/rt3090/rtmp_type.h
2584 Removing drivers/staging/rt3090/spectrum.h
2585 Removing drivers/staging/rt3090/spectrum_def.h
2586 Removing drivers/staging/rt3090/sta/assoc.c
2587 Removing drivers/staging/rt3090/sta/auth.c
2588 Removing drivers/staging/rt3090/sta/auth_rsp.c
2589 Removing drivers/staging/rt3090/sta/connect.c
2590 Removing drivers/staging/rt3090/sta/dls.c
2591 Removing drivers/staging/rt3090/sta/rtmp_ckipmic.c
2592 Removing drivers/staging/rt3090/sta/rtmp_data.c
2593 Removing drivers/staging/rt3090/sta/sanity.c
2594 Removing drivers/staging/rt3090/sta/sync.c
2595 Removing drivers/staging/rt3090/sta/wpa.c
2596 Removing drivers/staging/rt3090/sta_ioctl.c
2597 Removing drivers/staging/rt3090/vr_ikans.h
2598 Removing drivers/staging/rt3090/wpa.h
2599 Merge made by recursive.
2600 drivers/staging/Kconfig | 6 +-
2601 drivers/staging/Makefile | 3 +-
2602 drivers/staging/android/Kconfig | 95 -
2603 drivers/staging/android/Makefile | 6 -
2604 drivers/staging/android/TODO | 10 -
2605 drivers/staging/android/binder.c | 3767 ----------
2606 drivers/staging/android/binder.h | 330 -
2607 drivers/staging/android/logger.c | 607 --
2608 drivers/staging/android/logger.h | 48 -
2609 drivers/staging/android/lowmemorykiller.c | 173 -
2610 drivers/staging/android/ram_console.c | 410 --
2611 drivers/staging/android/timed_gpio.c | 166 -
2612 drivers/staging/android/timed_gpio.h | 33 -
2613 drivers/staging/android/timed_output.c | 121 -
2614 drivers/staging/android/timed_output.h | 37 -
2615 drivers/staging/b3dfg/b3dfg.c | 12 -
2616 drivers/staging/comedi/comedi_compat32.c | 22 +-
2617 drivers/staging/comedi/comedi_compat32.h | 4 +-
2618 drivers/staging/comedi/comedidev.h | 60 +-
2619 drivers/staging/comedi/drivers.c | 2 +-
2620 drivers/staging/comedi/drivers/8253.h | 3 +-
2621 drivers/staging/comedi/drivers/8255.c | 23 +-
2622 drivers/staging/comedi/drivers/acl7225b.c | 9 +-
2623 drivers/staging/comedi/drivers/adl_pci6208.c | 53 +-
2624 drivers/staging/comedi/drivers/adl_pci7296.c | 19 +-
2625 drivers/staging/comedi/drivers/adl_pci7432.c | 32 +-
2626 drivers/staging/comedi/drivers/amplc_pc263.c | 18 +-
2627 drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +-
2628 drivers/staging/comedi/drivers/cb_pcidda.c | 2 +-
2629 drivers/staging/comedi/drivers/dmm32at.c | 2 +-
2630 drivers/staging/comedi/drivers/dt2814.c | 2 +-
2631 drivers/staging/comedi/drivers/dt282x.c | 4 +-
2632 drivers/staging/comedi/drivers/mite.c | 231 +-
2633 drivers/staging/comedi/drivers/mite.h | 7 -
2634 drivers/staging/comedi/drivers/ni_at_ao.c | 6 +-
2635 drivers/staging/comedi/drivers/ni_atmio16d.c | 90 +-
2636 drivers/staging/comedi/drivers/ni_labpc.h | 52 +-
2637 drivers/staging/comedi/drivers/ni_labpc_cs.c | 18 +-
2638 drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
2639 drivers/staging/comedi/drivers/ni_mio_cs.c | 15 +-
2640 drivers/staging/comedi/drivers/ni_pcidio.c | 2 +-
2641 drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +-
2642 drivers/staging/comedi/drivers/rtd520.c | 2 +-
2643 drivers/staging/comedi/drivers/s626.c | 2 +-
2644 drivers/staging/comedi/drivers/skel.c | 2 +-
2645 drivers/staging/comedi/drivers/usbdux.c | 4 +-
2646 drivers/staging/comedi/drivers/vmk80xx.c | 24 +-
2647 drivers/staging/hv/TODO | 6 +
2648 drivers/staging/line6/driver.c | 103 +-
2649 drivers/staging/ramzswap/Kconfig | 21 +
2650 drivers/staging/ramzswap/Makefile | 3 +
2651 drivers/staging/ramzswap/TODO | 6 +
2652 drivers/staging/ramzswap/ramzswap.txt | 51 +
2653 drivers/staging/ramzswap/ramzswap_drv.c | 1435 ++++
2654 drivers/staging/ramzswap/ramzswap_drv.h | 171 +
2655 drivers/staging/ramzswap/ramzswap_ioctl.h | 49 +
2656 drivers/staging/ramzswap/xvmalloc.c | 507 ++
2657 drivers/staging/ramzswap/xvmalloc.h | 30 +
2658 drivers/staging/ramzswap/xvmalloc_int.h | 86 +
2659 drivers/staging/rt2860/2860_main_dev.c | 1319 ----
2660 drivers/staging/rt2860/Kconfig | 5 +-
2661 drivers/staging/rt2860/Makefile | 31 +-
2662 drivers/staging/rt2860/aironet.h | 210 -
2663 drivers/staging/rt2860/ap.h | 12 +-
2664 drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h | 87 +-
2665 drivers/staging/rt2860/chip/mac_usb.h | 365 +
2666 .../{rt3090/netif_block.h => rt2860/chip/rt2860.h} | 44 +-
2667 .../{rt3090/rt33xx.h => rt2860/chip/rt2870.h} | 31 +-
2668 .../{rt3090/rt3370.h => rt2860/chip/rt3070.h} | 20 +-
2669 drivers/staging/{rt3090 => rt2860/chip}/rt3090.h | 5 -
2670 drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h | 0
2671 .../staging/rt2860/{rt28xx.h => chip/rtmp_mac.h} | 952 +--
2672 drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h | 77 +-
2673 drivers/staging/rt2860/chips/rt3070.c | 185 +
2674 drivers/staging/{rt3090 => rt2860}/chips/rt3090.c | 0
2675 drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c | 12 +
2676 drivers/staging/rt2860/chlist.h | 1223 +---
2677 drivers/staging/rt2860/common/2860_rtmp_init.c | 897 ---
2678 drivers/staging/rt2860/common/action.c | 12 +-
2679 drivers/staging/rt2860/common/ba_action.c | 147 +-
2680 .../staging/{rt3090 => rt2860}/common/cmm_aes.c | 158 +-
2681 .../staging/{rt3090 => rt2860}/common/cmm_asic.c | 393 +-
2682 .../staging/{rt3090 => rt2860}/common/cmm_cfg.c | 9 +-
2683 drivers/staging/rt2860/common/cmm_data.c | 906 +--
2684 drivers/staging/rt2860/common/cmm_data_2860.c | 1197 ----
2685 .../{rt3090 => rt2860}/common/cmm_data_pci.c | 459 +--
2686 .../common/cmm_data_usb.c} | 256 +-
2687 drivers/staging/rt2860/common/cmm_info.c | 822 ++-
2688 .../{rt3090 => rt2860}/common/cmm_mac_pci.c | 146 +-
2689 drivers/staging/rt2860/common/cmm_mac_usb.c | 1216 ++++
2690 .../{rt3090 => rt2860}/common/cmm_profile.c | 558 +--
2691 drivers/staging/rt2860/common/cmm_sanity.c | 233 +-
2692 drivers/staging/rt2860/common/cmm_sync.c | 57 +-
2693 .../staging/{rt3090 => rt2860}/common/cmm_tkip.c | 86 +-
2694 .../staging/{rt3090 => rt2860}/common/cmm_wep.c | 3 +-
2695 drivers/staging/rt2860/common/cmm_wpa.c | 2428 ++++++-
2696 .../staging/{rt3090 => rt2860}/common/crypt_hmac.c | 16 +-
2697 .../staging/{rt3090 => rt2860}/common/crypt_md5.c | 1 -
2698 .../staging/{rt3090 => rt2860}/common/crypt_sha2.c | 7 +-
2699 drivers/staging/rt2860/common/dfs.c | 360 -
2700 .../staging/{rt3090 => rt2860}/common/ee_efuse.c | 33 +-
2701 .../staging/{rt3090 => rt2860}/common/ee_prom.c | 44 +-
2702 drivers/staging/rt2860/common/eeprom.c | 1460 +----
2703 drivers/staging/rt2860/common/firmware.h | 2 +-
2704 drivers/staging/rt2860/common/firmware_3070.h | 517 ++
2705 drivers/staging/rt2860/common/md5.c | 1415 ----
2706 drivers/staging/rt2860/common/mlme.c | 5182 ++++----------
2707 .../staging/{rt3090 => rt2860}/common/rt_channel.c | 7 -
2708 drivers/staging/{rt3090 => rt2860}/common/rt_rf.c | 23 +-
2709 drivers/staging/rt2860/common/rtmp_init.c | 2028 +++---
2710 drivers/staging/rt2860/common/rtmp_mcu.c | 311 +
2711 .../staging/{rt3090 => rt2860}/common/rtmp_timer.c | 18 +-
2712 drivers/staging/rt2860/common/rtmp_tkip.c | 1586 ----
2713 drivers/staging/rt2860/common/rtmp_wep.c | 497 --
2714 drivers/staging/rt2860/common/spectrum.c | 460 +-
2715 drivers/staging/rt2860/config.mk | 241 -
2716 drivers/staging/{rt3090 => rt2860}/crypt_hmac.h | 13 +-
2717 drivers/staging/{rt3090 => rt2860}/crypt_md5.h | 12 +-
2718 drivers/staging/{rt3090 => rt2860}/crypt_sha2.h | 14 +-
2719 drivers/staging/rt2860/dfs.h | 47 -
2720 drivers/staging/{rt3090 => rt2860}/eeprom.h | 31 +-
2721 .../staging/{rt3090 => rt2860/iface}/rtmp_pci.h | 51 +-
2722 drivers/staging/rt2860/iface/rtmp_usb.h | 200 +
2723 drivers/staging/rt2860/md5.h | 107 -
2724 drivers/staging/rt2860/mlme.h | 89 +-
2725 drivers/staging/rt2860/oid.h | 135 +-
2726 drivers/staging/{rt3090 => rt2860}/pci_main_dev.c | 161 +-
2727 drivers/staging/rt2860/rt2860.h | 333 -
2728 drivers/staging/rt2860/rt_config.h | 32 +-
2729 drivers/staging/rt2860/rt_linux.c | 618 ++-
2730 drivers/staging/rt2860/rt_linux.h | 973 ++--
2731 drivers/staging/rt2860/rt_main_dev.c | 747 +--
2732 drivers/staging/{rt3090 => rt2860}/rt_pci_rbus.c | 124 +-
2733 drivers/staging/rt2860/rt_profile.c | 1839 +-----
2734 drivers/staging/rt2860/rt_usb.c | 828 +++
2735 drivers/staging/rt2860/rtmp.h | 2905 +++-----
2736 drivers/staging/{rt3090 => rt2860}/rtmp_chip.h | 107 +-
2737 drivers/staging/rt2860/rtmp_def.h | 294 +-
2738 drivers/staging/{rt3090 => rt2860}/rtmp_dot11.h | 44 -
2739 drivers/staging/{rt3090 => rt2860}/rtmp_iface.h | 7 +-
2740 drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h | 0
2741 drivers/staging/{rt3090 => rt2860}/rtmp_os.h | 5 +
2742 drivers/staging/{rt3090 => rt2860}/rtmp_timer.h | 18 +-
2743 drivers/staging/rt2860/rtmp_type.h | 55 +-
2744 drivers/staging/rt2860/rtusb_io.h | 189 +
2745 drivers/staging/rt2860/spectrum.h | 169 +-
2746 drivers/staging/rt2860/spectrum_def.h | 148 +-
2747 drivers/staging/rt2860/sta/aironet.c | 1312 ----
2748 drivers/staging/rt2860/sta/assoc.c | 315 +-
2749 drivers/staging/rt2860/sta/auth.c | 138 +-
2750 drivers/staging/rt2860/sta/auth_rsp.c | 12 +-
2751 drivers/staging/rt2860/sta/connect.c | 485 +-
2752 drivers/staging/rt2860/sta/rtmp_data.c | 258 +-
2753 drivers/staging/rt2860/sta/sanity.c | 44 +-
2754 drivers/staging/rt2860/sta/sync.c | 416 +-
2755 drivers/staging/rt2860/sta/wpa.c | 1944 +-----
2756 drivers/staging/rt2860/sta_ioctl.c | 768 ++-
2757 drivers/staging/rt2860/usb_main_dev.c | 897 +++
2758 drivers/staging/rt2860/wpa.h | 97 +-
2759 drivers/staging/rt2870/2870_main_dev.c | 1530 ----
2760 drivers/staging/rt2870/Makefile | 32 +-
2761 drivers/staging/rt2870/chips/rt3070.c | 1 +
2762 drivers/staging/rt2870/chips/rt30xx.c | 1 +
2763 drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 -----
2764 drivers/staging/rt2870/common/acction.c | 1 +
2765 drivers/staging/rt2870/common/cmm_aes.c | 1 +
2766 drivers/staging/rt2870/common/cmm_asic.c | 1 +
2767 drivers/staging/rt2870/common/cmm_cfg.c | 1 +
2768 drivers/staging/rt2870/common/cmm_data_usb.c | 1 +
2769 drivers/staging/rt2870/common/cmm_mac_usb.c | 1 +
2770 drivers/staging/rt2870/common/cmm_profile.c | 1 +
2771 drivers/staging/rt2870/common/cmm_tkip.c | 1 +
2772 drivers/staging/rt2870/common/cmm_wep.c | 1 +
2773 drivers/staging/rt2870/common/crypt_hmac.c | 1 +
2774 drivers/staging/rt2870/common/crypt_md5.c | 1 +
2775 drivers/staging/rt2870/common/crypt_sha2.c | 1 +
2776 drivers/staging/rt2870/common/ee_efuse.c | 1 +
2777 drivers/staging/rt2870/common/rt_channel.c | 1 +
2778 drivers/staging/rt2870/common/rt_rf.c | 1 +
2779 drivers/staging/rt2870/common/rtmp_mcu.c | 1 +
2780 drivers/staging/rt2870/common/rtmp_timer.c | 1 +
2781 drivers/staging/rt2870/common/rtusb_bulk.c | 37 +-
2782 drivers/staging/rt2870/common/rtusb_data.c | 55 +
2783 drivers/staging/rt2870/common/rtusb_io.c | 465 +-
2784 drivers/staging/rt2870/rt2870.h | 583 --
2785 drivers/staging/rt2870/rt_usb.c | 1 +
2786 drivers/staging/rt2870/usb_main_dev.c | 1 +
2787 drivers/staging/rt3070/firmware.h | 2 +-
2788 drivers/staging/rt3090/Kconfig | 5 -
2789 drivers/staging/rt3090/Makefile | 80 -
2790 drivers/staging/rt3090/action.h | 66 -
2791 drivers/staging/rt3090/ap.h | 512 --
2792 drivers/staging/rt3090/ap_apcli.h | 276 -
2793 drivers/staging/rt3090/ap_autoChSel.h | 79 -
2794 drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 -
2795 drivers/staging/rt3090/ap_cfg.h | 118 -
2796 drivers/staging/rt3090/ap_ids.h | 82 -
2797 drivers/staging/rt3090/ap_mbss.h | 72 -
2798 drivers/staging/rt3090/ap_uapsd.h | 636 --
2799 drivers/staging/rt3090/ap_wds.h | 212 -
2800 drivers/staging/rt3090/chips/rt3370.c | 121 -
2801 drivers/staging/rt3090/chips/rt3390.c | 122 -
2802 drivers/staging/rt3090/chips/rt33xx.c | 536 --
2803 drivers/staging/rt3090/chlist.h | 130 -
2804 drivers/staging/rt3090/common/action.c | 1057 ---
2805 drivers/staging/rt3090/common/ba_action.c | 1779 -----
2806 drivers/staging/rt3090/common/cmm_data.c | 2763 -------
2807 drivers/staging/rt3090/common/cmm_info.c | 3717 ----------
2808 drivers/staging/rt3090/common/cmm_sanity.c | 1718 -----
2809 drivers/staging/rt3090/common/cmm_sync.c | 734 --
2810 drivers/staging/rt3090/common/cmm_wpa.c | 3149 --------
2811 drivers/staging/rt3090/common/crypt_aes.c | 1007 ---
2812 drivers/staging/rt3090/common/crypt_biginteger.c | 1119 ---
2813 drivers/staging/rt3090/common/crypt_dh.c | 234 -
2814 drivers/staging/rt3090/common/dfs.c | 481 --
2815 drivers/staging/rt3090/common/eeprom.c | 98 -
2816 drivers/staging/rt3090/common/igmp_snoop.c | 1365 ----
2817 drivers/staging/rt3090/common/mlme.c | 6550 -----------------
2818 drivers/staging/rt3090/common/mlme_ex.c | 215 -
2819 drivers/staging/rt3090/common/netif_block.c | 147 -
2820 drivers/staging/rt3090/common/rtmp_init.c | 3882 ----------
2821 drivers/staging/rt3090/common/rtmp_mcu.c | 560 --
2822 drivers/staging/rt3090/common/spectrum.c | 2221 ------
2823 drivers/staging/rt3090/config.mk | 187 -
2824 drivers/staging/rt3090/dfs.h | 137 -
2825 drivers/staging/rt3090/firmware.h | 2 +-
2826 drivers/staging/rt3090/igmp_snoop.h | 152 -
2827 drivers/staging/rt3090/ipv6.h | 215 -
2828 drivers/staging/rt3090/link_list.h | 133 -
2829 drivers/staging/rt3090/mlme.h | 1360 ----
2830 drivers/staging/rt3090/mlme_ex.h | 83 -
2831 drivers/staging/rt3090/mlme_ex_def.h | 53 -
2832 drivers/staging/rt3090/oid.h | 1144 ---
2833 drivers/staging/rt3090/rt3390.h | 77 -
2834 drivers/staging/rt3090/rt_ate.c | 6089 ----------------
2835 drivers/staging/rt3090/rt_ate.h | 314 -
2836 drivers/staging/rt3090/rt_config.h | 126 -
2837 drivers/staging/rt3090/rt_linux.c | 1623 -----
2838 drivers/staging/rt3090/rt_linux.h | 1034 ---
2839 drivers/staging/rt3090/rt_main_dev.c | 897 ---
2840 drivers/staging/rt3090/rt_profile.c | 101 -
2841 drivers/staging/rt3090/rtmp.h | 6873 ------------------
2842 drivers/staging/rt3090/rtmp_def.h | 1650 -----
2843 drivers/staging/rt3090/rtmp_mac.h | 2304 ------
2844 drivers/staging/rt3090/rtmp_type.h | 147 -
2845 drivers/staging/rt3090/spectrum.h | 234 -
2846 drivers/staging/rt3090/spectrum_def.h | 257 -
2847 drivers/staging/rt3090/sta/assoc.c | 1673 -----
2848 drivers/staging/rt3090/sta/auth.c | 491 --
2849 drivers/staging/rt3090/sta/auth_rsp.c | 151 -
2850 drivers/staging/rt3090/sta/connect.c | 2759 -------
2851 drivers/staging/rt3090/sta/dls.c | 2207 ------
2852 drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 --
2853 drivers/staging/rt3090/sta/rtmp_data.c | 2661 -------
2854 drivers/staging/rt3090/sta/sanity.c | 382 -
2855 drivers/staging/rt3090/sta/sync.c | 1840 -----
2856 drivers/staging/rt3090/sta/wpa.c | 396 -
2857 drivers/staging/rt3090/sta_ioctl.c | 7557 --------------------
2858 drivers/staging/rt3090/vr_ikans.h | 71 -
2859 drivers/staging/rt3090/wpa.h | 447 --
2860 260 files changed, 19058 insertions(+), 122470 deletions(-)
2861 delete mode 100644 drivers/staging/android/Kconfig
2862 delete mode 100644 drivers/staging/android/Makefile
2863 delete mode 100644 drivers/staging/android/TODO
2864 delete mode 100644 drivers/staging/android/binder.c
2865 delete mode 100644 drivers/staging/android/binder.h
2866 delete mode 100644 drivers/staging/android/logger.c
2867 delete mode 100644 drivers/staging/android/logger.h
2868 delete mode 100644 drivers/staging/android/lowmemorykiller.c
2869 delete mode 100644 drivers/staging/android/ram_console.c
2870 delete mode 100644 drivers/staging/android/timed_gpio.c
2871 delete mode 100644 drivers/staging/android/timed_gpio.h
2872 delete mode 100644 drivers/staging/android/timed_output.c
2873 delete mode 100644 drivers/staging/android/timed_output.h
2874 create mode 100644 drivers/staging/ramzswap/Kconfig
2875 create mode 100644 drivers/staging/ramzswap/Makefile
2876 create mode 100644 drivers/staging/ramzswap/TODO
2877 create mode 100644 drivers/staging/ramzswap/ramzswap.txt
2878 create mode 100644 drivers/staging/ramzswap/ramzswap_drv.c
2879 create mode 100644 drivers/staging/ramzswap/ramzswap_drv.h
2880 create mode 100644 drivers/staging/ramzswap/ramzswap_ioctl.h
2881 create mode 100644 drivers/staging/ramzswap/xvmalloc.c
2882 create mode 100644 drivers/staging/ramzswap/xvmalloc.h
2883 create mode 100644 drivers/staging/ramzswap/xvmalloc_int.h
2884 delete mode 100644 drivers/staging/rt2860/2860_main_dev.c
2885 delete mode 100644 drivers/staging/rt2860/aironet.h
2886 rename drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h (85%)
2887 create mode 100644 drivers/staging/rt2860/chip/mac_usb.h
2888 rename drivers/staging/{rt3090/netif_block.h => rt2860/chip/rt2860.h} (68%)
2889 rename drivers/staging/{rt3090/rt33xx.h => rt2860/chip/rt2870.h} (78%)
2890 rename drivers/staging/{rt3090/rt3370.h => rt2860/chip/rt3070.h} (90%)
2891 rename drivers/staging/{rt3090 => rt2860/chip}/rt3090.h (94%)
2892 rename drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h (100%)
2893 rename drivers/staging/rt2860/{rt28xx.h => chip/rtmp_mac.h} (70%)
2894 rename drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h (91%)
2895 create mode 100644 drivers/staging/rt2860/chips/rt3070.c
2896 rename drivers/staging/{rt3090 => rt2860}/chips/rt3090.c (100%)
2897 rename drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c (98%)
2898 delete mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c
2899 rename drivers/staging/{rt3090 => rt2860}/common/cmm_aes.c (93%)
2900 rename drivers/staging/{rt3090 => rt2860}/common/cmm_asic.c (89%)
2901 rename drivers/staging/{rt3090 => rt2860}/common/cmm_cfg.c (97%)
2902 delete mode 100644 drivers/staging/rt2860/common/cmm_data_2860.c
2903 rename drivers/staging/{rt3090 => rt2860}/common/cmm_data_pci.c (67%)
2904 rename drivers/staging/{rt2870/common/cmm_data_2870.c => rt2860/common/cmm_data_usb.c} (85%)
2905 rename drivers/staging/{rt3090 => rt2860}/common/cmm_mac_pci.c (94%)
2906 create mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c
2907 rename drivers/staging/{rt3090 => rt2860}/common/cmm_profile.c (76%)
2908 rename drivers/staging/{rt3090 => rt2860}/common/cmm_tkip.c (91%)
2909 rename drivers/staging/{rt3090 => rt2860}/common/cmm_wep.c (99%)
2910 rename drivers/staging/{rt3090 => rt2860}/common/crypt_hmac.c (94%)
2911 rename drivers/staging/{rt3090 => rt2860}/common/crypt_md5.c (99%)
2912 rename drivers/staging/{rt3090 => rt2860}/common/crypt_sha2.c (99%)
2913 rename drivers/staging/{rt3090 => rt2860}/common/ee_efuse.c (98%)
2914 rename drivers/staging/{rt3090 => rt2860}/common/ee_prom.c (82%)
2915 create mode 100644 drivers/staging/rt2860/common/firmware_3070.h
2916 delete mode 100644 drivers/staging/rt2860/common/md5.c
2917 rename drivers/staging/{rt3090 => rt2860}/common/rt_channel.c (99%)
2918 rename drivers/staging/{rt3090 => rt2860}/common/rt_rf.c (92%)
2919 create mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c
2920 rename drivers/staging/{rt3090 => rt2860}/common/rtmp_timer.c (97%)
2921 delete mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c
2922 delete mode 100644 drivers/staging/rt2860/common/rtmp_wep.c
2923 delete mode 100644 drivers/staging/rt2860/config.mk
2924 rename drivers/staging/{rt3090 => rt2860}/crypt_hmac.h (87%)
2925 rename drivers/staging/{rt3090 => rt2860}/crypt_md5.h (88%)
2926 rename drivers/staging/{rt3090 => rt2860}/crypt_sha2.h (90%)
2927 rename drivers/staging/{rt3090 => rt2860}/eeprom.h (79%)
2928 rename drivers/staging/{rt3090 => rt2860/iface}/rtmp_pci.h (63%)
2929 create mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h
2930 delete mode 100644 drivers/staging/rt2860/md5.h
2931 rename drivers/staging/{rt3090 => rt2860}/pci_main_dev.c (92%)
2932 delete mode 100644 drivers/staging/rt2860/rt2860.h
2933 rename drivers/staging/{rt3090 => rt2860}/rt_pci_rbus.c (88%)
2934 create mode 100644 drivers/staging/rt2860/rt_usb.c
2935 rename drivers/staging/{rt3090 => rt2860}/rtmp_chip.h (76%)
2936 rename drivers/staging/{rt3090 => rt2860}/rtmp_dot11.h (70%)
2937 rename drivers/staging/{rt3090 => rt2860}/rtmp_iface.h (95%)
2938 rename drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h (100%)
2939 rename drivers/staging/{rt3090 => rt2860}/rtmp_os.h (97%)
2940 rename drivers/staging/{rt3090 => rt2860}/rtmp_timer.h (96%)
2941 create mode 100644 drivers/staging/rt2860/rtusb_io.h
2942 delete mode 100644 drivers/staging/rt2860/sta/aironet.c
2943 create mode 100644 drivers/staging/rt2860/usb_main_dev.c
2944 delete mode 100644 drivers/staging/rt2870/2870_main_dev.c
2945 create mode 100644 drivers/staging/rt2870/chips/rt3070.c
2946 create mode 100644 drivers/staging/rt2870/chips/rt30xx.c
2947 delete mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c
2948 create mode 100644 drivers/staging/rt2870/common/acction.c
2949 create mode 100644 drivers/staging/rt2870/common/cmm_aes.c
2950 create mode 100644 drivers/staging/rt2870/common/cmm_asic.c
2951 create mode 100644 drivers/staging/rt2870/common/cmm_cfg.c
2952 create mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c
2953 create mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c
2954 create mode 100644 drivers/staging/rt2870/common/cmm_profile.c
2955 create mode 100644 drivers/staging/rt2870/common/cmm_tkip.c
2956 create mode 100644 drivers/staging/rt2870/common/cmm_wep.c
2957 create mode 100644 drivers/staging/rt2870/common/crypt_hmac.c
2958 create mode 100644 drivers/staging/rt2870/common/crypt_md5.c
2959 create mode 100644 drivers/staging/rt2870/common/crypt_sha2.c
2960 create mode 100644 drivers/staging/rt2870/common/ee_efuse.c
2961 create mode 100644 drivers/staging/rt2870/common/rt_channel.c
2962 create mode 100644 drivers/staging/rt2870/common/rt_rf.c
2963 create mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c
2964 create mode 100644 drivers/staging/rt2870/common/rtmp_timer.c
2965 delete mode 100644 drivers/staging/rt2870/rt2870.h
2966 create mode 100644 drivers/staging/rt2870/rt_usb.c
2967 create mode 100644 drivers/staging/rt2870/usb_main_dev.c
2968 delete mode 100644 drivers/staging/rt3090/Kconfig
2969 delete mode 100644 drivers/staging/rt3090/Makefile
2970 delete mode 100644 drivers/staging/rt3090/action.h
2971 delete mode 100644 drivers/staging/rt3090/ap.h
2972 delete mode 100644 drivers/staging/rt3090/ap_apcli.h
2973 delete mode 100644 drivers/staging/rt3090/ap_autoChSel.h
2974 delete mode 100644 drivers/staging/rt3090/ap_autoChSel_cmm.h
2975 delete mode 100644 drivers/staging/rt3090/ap_cfg.h
2976 delete mode 100644 drivers/staging/rt3090/ap_ids.h
2977 delete mode 100644 drivers/staging/rt3090/ap_mbss.h
2978 delete mode 100644 drivers/staging/rt3090/ap_uapsd.h
2979 delete mode 100644 drivers/staging/rt3090/ap_wds.h
2980 delete mode 100644 drivers/staging/rt3090/chips/rt3370.c
2981 delete mode 100644 drivers/staging/rt3090/chips/rt3390.c
2982 delete mode 100644 drivers/staging/rt3090/chips/rt33xx.c
2983 delete mode 100644 drivers/staging/rt3090/chlist.h
2984 delete mode 100644 drivers/staging/rt3090/common/action.c
2985 delete mode 100644 drivers/staging/rt3090/common/ba_action.c
2986 delete mode 100644 drivers/staging/rt3090/common/cmm_data.c
2987 delete mode 100644 drivers/staging/rt3090/common/cmm_info.c
2988 delete mode 100644 drivers/staging/rt3090/common/cmm_sanity.c
2989 delete mode 100644 drivers/staging/rt3090/common/cmm_sync.c
2990 delete mode 100644 drivers/staging/rt3090/common/cmm_wpa.c
2991 delete mode 100644 drivers/staging/rt3090/common/crypt_aes.c
2992 delete mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c
2993 delete mode 100644 drivers/staging/rt3090/common/crypt_dh.c
2994 delete mode 100644 drivers/staging/rt3090/common/dfs.c
2995 delete mode 100644 drivers/staging/rt3090/common/eeprom.c
2996 delete mode 100644 drivers/staging/rt3090/common/igmp_snoop.c
2997 delete mode 100644 drivers/staging/rt3090/common/mlme.c
2998 delete mode 100644 drivers/staging/rt3090/common/mlme_ex.c
2999 delete mode 100644 drivers/staging/rt3090/common/netif_block.c
3000 delete mode 100644 drivers/staging/rt3090/common/rtmp_init.c
3001 delete mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c
3002 delete mode 100644 drivers/staging/rt3090/common/spectrum.c
3003 delete mode 100644 drivers/staging/rt3090/config.mk
3004 delete mode 100644 drivers/staging/rt3090/dfs.h
3005 delete mode 100644 drivers/staging/rt3090/igmp_snoop.h
3006 delete mode 100644 drivers/staging/rt3090/ipv6.h
3007 delete mode 100644 drivers/staging/rt3090/link_list.h
3008 delete mode 100644 drivers/staging/rt3090/mlme.h
3009 delete mode 100644 drivers/staging/rt3090/mlme_ex.h
3010 delete mode 100644 drivers/staging/rt3090/mlme_ex_def.h
3011 delete mode 100644 drivers/staging/rt3090/oid.h
3012 delete mode 100644 drivers/staging/rt3090/rt3390.h
3013 delete mode 100644 drivers/staging/rt3090/rt_ate.c
3014 delete mode 100644 drivers/staging/rt3090/rt_ate.h
3015 delete mode 100644 drivers/staging/rt3090/rt_config.h
3016 delete mode 100644 drivers/staging/rt3090/rt_linux.c
3017 delete mode 100644 drivers/staging/rt3090/rt_linux.h
3018 delete mode 100644 drivers/staging/rt3090/rt_main_dev.c
3019 delete mode 100644 drivers/staging/rt3090/rt_profile.c
3020 delete mode 100644 drivers/staging/rt3090/rtmp.h
3021 delete mode 100644 drivers/staging/rt3090/rtmp_def.h
3022 delete mode 100644 drivers/staging/rt3090/rtmp_mac.h
3023 delete mode 100644 drivers/staging/rt3090/rtmp_type.h
3024 delete mode 100644 drivers/staging/rt3090/spectrum.h
3025 delete mode 100644 drivers/staging/rt3090/spectrum_def.h
3026 delete mode 100644 drivers/staging/rt3090/sta/assoc.c
3027 delete mode 100644 drivers/staging/rt3090/sta/auth.c
3028 delete mode 100644 drivers/staging/rt3090/sta/auth_rsp.c
3029 delete mode 100644 drivers/staging/rt3090/sta/connect.c
3030 delete mode 100644 drivers/staging/rt3090/sta/dls.c
3031 delete mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c
3032 delete mode 100644 drivers/staging/rt3090/sta/rtmp_data.c
3033 delete mode 100644 drivers/staging/rt3090/sta/sanity.c
3034 delete mode 100644 drivers/staging/rt3090/sta/sync.c
3035 delete mode 100644 drivers/staging/rt3090/sta/wpa.c
3036 delete mode 100644 drivers/staging/rt3090/sta_ioctl.c
3037 delete mode 100644 drivers/staging/rt3090/vr_ikans.h
3038 delete mode 100644 drivers/staging/rt3090/wpa.h
3039 $ git revert a724aa0a5ad2b3c6b5ee48e79a09e9fbc5cf3ec9
3040 Finished one revert.
3041 [master fe79f27] Revert "tty: esp: remove broken driver"
3042 5 files changed, 2815 insertions(+), 0 deletions(-)
3043 create mode 100644 Documentation/serial/hayes-esp.txt
3044 create mode 100644 drivers/char/esp.c
3045 create mode 100644 include/linux/hayesesp.h
3046 Merging scsi-post-merge/master
3047 $ git merge scsi-post-merge/master
3048 Already up-to-date.
3049 $ git revert 71034ba845c9ff219373066f904286c0b7506922
3050 Finished one revert.
3051 [master d8fba4d] Revert "cnic: Add main functions to support bnx2x devices."
3052 1 files changed, 0 insertions(+), 1742 deletions(-)