Merge tag 'xtensa-for-next-20141213' of git://github.com/jcmvbkbc/linux-xtensa into...
authorChris Zankel <chris@zankel.net>
Tue, 16 Dec 2014 04:10:39 +0000 (20:10 -0800)
committerChris Zankel <chris@zankel.net>
Tue, 16 Dec 2014 04:10:39 +0000 (20:10 -0800)
Xtensa improvements for 3.19:

- fix permissions for kmapped pages so that copy_to_user_page works with
  them;
- add power management menu to Kconfig to allow use of runtime PM.

1  2 
arch/xtensa/Kconfig

Simple merge