]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/headers' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 5 Nov 2012 18:53:46 +0000 (10:53 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 5 Nov 2012 18:57:39 +0000 (10:57 -0800)
* next/headers: (45 commits)
  ARM: OMAP1: fix sparse warning added by commit 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
  ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
  ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
  ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
  ARM: OMAP2+: Introduce local usb.h
  ARM: OMAP: Split plat/serial.h for omap1 and omap2+
  ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2
  tty/serial/8250: Make omap hardware workarounds local to 8250.h
  serial/8250/8250_early: Prevent rounding error in uartclk
  serial: samsung: use clk_prepare_enable and clk_disable_unprepare
  TTY: Report warning when low_latency flag is wrongly used
  console: use might_sleep in console_lock
  TTY: move tty buffers to tty_port
  TTY: add port -> tty link
  TTY: tty_buffer, cache pointer to tty->buf
  TTY: move TTY_FLUSH* flags to tty_port
  TTY: n_tty, propagate n_tty_data
  TTY: move ldisc data from tty_struct: locks
  TTY: move ldisc data from tty_struct: read_* and echo_* and canon_* stuff
  TTY: move ldisc data from tty_struct: bitmaps
  ...

1  2 
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/serial.c
drivers/usb/musb/musb_dsps.c

index 8e49d7ca59c5e6865241c48eddb9deddcd4948cd,0000000000000000000000000000000000000000..c00270067b8c550dc9880671bdca0c4f08156049
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,39 @@@
 +arm-soc for-next contents for 3.8:
 +
++External dependencies:
++depends/tty             gregkh's tty tree @54ec52b6dd3b0ba4bc4eb97e7e1b2534705b326c
++depends/omap-cleanup-headers-usb        git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap-for-v3.8/cleanup-headers-usb
++depends/omap-cleanup-headers-menelaus   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap-for-v3.8/cleanup-headers-menelaus
++
++
 +next/fixes-non-critical:
 +vexpress/fixes                git://git.linaro.org/people/pawelmoll/linux.git vexpress-fixes
 +
 +next/cleanup:
 +imx/multiplatform     git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform
 +                      (pulled twice)
 +vt8500/cleanup                git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8
 +
 +next/headers:
 +omap/headers          git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap-for-v3.8/cleanup-headers-signed
++omap/cleanup-headers-3  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
++                      depends on depends/tty and depends/omap-cleanup*
++omap/cleanup-prcm     git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
++
 +
 +next/multiplatform:
 +vt8500/multiplatform  git://server.prisktech.co.nz/git/linuxwmt.git/ tags/armsoc-for-3.8
 +
 +next/soc:
 +ux500/core            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git ux500-core
 +clps711x/soc          patches from Alexander Shiyan <shc_work@mail.ru>
 +vexpress/soc          git://git.linaro.org/people/pawelmoll/linux vexpress-soc
 +
 +next/smp:
 +socfpga/smp           patch from Dinh Nguyen <dinguyen@altera.com>
+++ patch <1351183299-17346-1-git-send-email-dinguyen@altera.com>
+++ patch <20121029002724.GA27891@elf.ucw.cz>
 +
 +next/drivers:
 +vexpress/drivers      git://git.linaro.org/people/pawelmoll/linux vexpress/drivers
 +
Simple merge
Simple merge
Simple merge