diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 19:19:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 19:19:27 +0300 |
| commit | d6bcc8069b27090f7e5bbe0521774f11c68a7001 (patch) | |
| tree | de8cc88628b8fb13fcb95fc4d2683317f16c0b43 /Documentation/filesystems/dnotify.txt | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
| parent | 2a9fe3ca84afff6259820c4f62e579f41476becc (diff) | |
| download | linux-d6bcc8069b27090f7e5bbe0521774f11c68a7001.tar.xz | |
Merge tag 'v4.1-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes
Merge "ARM: rockchip: some soc-level fixes for 4.1" from Heiko Stübner:
Two fixes from Chris Zhong, fixing some suspend oddities.
And I've given up on the timer7 issue. While I initially thought
devices would either have both the grave mmu issue requiring a uboot
update and the timer7 issue or none, it looks like in all units in the
field the mmu issue got fixed while the timer7 issue stayed on.
So instead of making everybody wanting to use mainline jump through a
hoop just make sure timer7 is on on boot before we init the arch-timer.
* tag 'v4.1-rockchip-socfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
rockchip: make sure timer7 is enabled on rk3288 platforms
ARM: rockchip: fix undefined instruction of reset_ctrl_regs
ARM: rockchip: disable dapswjdp during suspend
Diffstat (limited to 'Documentation/filesystems/dnotify.txt')
0 files changed, 0 insertions, 0 deletions