diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-05 12:16:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-05 12:16:13 +0200 |
| commit | e15ebe05cce44c5164dbf8489841c18a887bcfc2 (patch) | |
| tree | bfe51edae55d24097ae1804e5c9f3aa7e1a0c2c1 /net/x25 | |
| parent | 8d111444bde8949f1df442907e261b2558cec5cb (diff) | |
| parent | fa2976a811a764573b2a9c79126d4d66f1f16268 (diff) | |
| download | linux-e15ebe05cce44c5164dbf8489841c18a887bcfc2.tar.bz2 | |
Merge tag 'omap-fixes-for-v3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
PM related fixes for omaps mostly to get suspend/resume
working again.
* tag 'omap-fixes-for-v3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: hwmod data: Fix wrong McBSP clock alias on OMAP4
ARM: OMAP4: hwmod data: temporarily comment out data for the usb_host_fs and aess IP blocks
ARM: OMAP4: TWL6030: ensure sys_nirq1 is mux'd and wakeup enabled
ARM: OMAP2: Overo: init I2C before MMC to fix MMC suspend/resume failure
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/x25')
0 files changed, 0 insertions, 0 deletions