diff options
| author | 2014-03-17 10:14:40 +0100 | |
|---|---|---|
| committer | 2014-03-17 10:14:46 +0100 | |
| commit | 3c883ef345952766f2dc2d77f4e8269913511c83 (patch) | |
| tree | 101218acc1290dc8d52d0cae3f7e072173ace584 /include/linux/stackprotector.h | |
| parent | Merge branch 'efm32/cleanup' into next/dt (diff) | |
| parent | ARM: efm32: properly namespace i2c location property (diff) | |
Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt
Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:
* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
ARM: efm32: properly namespace i2c location property
ARM: efm32: fix unit address part in USART2 device nodes' names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/stackprotector.h')
0 files changed, 0 insertions, 0 deletions
