diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 20:49:56 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 20:49:56 +0400 |
commit | fb8b00675eb6462aacab56bca31ed6107bda5314 (patch) | |
tree | cd3c081dca9ea37d2ddc5e13b55fb4baeccf5452 /include/linux/platform_data/omap4-keypad.h | |
parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
parent | d5c15f17844b8883bc13b61a8ae114f0d3d59cdd (diff) | |
download | linux-fb8b00675eb6462aacab56bca31ed6107bda5314.tar.xz |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze changes from Michal Simek.
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Setup correct pointer to TLS area
microblaze: Add TLS support to sys_clone
microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
microblaze: Port OOM changes to do_page_fault
microblaze: Do not select GENERIC_GPIO by default
Diffstat (limited to 'include/linux/platform_data/omap4-keypad.h')
0 files changed, 0 insertions, 0 deletions