diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 20:22:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-25 20:22:39 +0100 |
| commit | 80528e197e2924ba82c06f30a9928e93c4f16a33 (patch) | |
| tree | e8d285100bfbaf9fd7d5a905c63a35b5773ce9de /init | |
| parent | dd67f8a05dcaeb818eb6dee4ab4ea0b2490b0efc (diff) | |
| parent | d5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93 (diff) | |
| download | linux-80528e197e2924ba82c06f30a9928e93c4f16a33.tar.gz linux-80528e197e2924ba82c06f30a9928e93c4f16a33.tar.bz2 linux-80528e197e2924ba82c06f30a9928e93c4f16a33.zip | |
Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/cleanup
Merge "efm32 cleanups for next" from Uwe Kleine-König
Just three simple cleanups for efm32 removing two now unused files and a
superflous select by ARCH_EFM32.
As these cleanups have dependencies on both v3.14-rc1 and my timex.h cleanup
(which is based on v3.13-rc1) this pull request also included a merge of my
cleanup tag which is already in armsoc/next/cleanup.
* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
ARM: efm32: drop unused file <mach/timex.h>
ARM: efm32: drop selecting CLKSRC_MMIO
ARM: efm32: drop unused file entry-macro.S
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions