diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:07:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:07:37 -0800 |
| commit | b01ee53dda8bd81855b7cda0dfb7f27d1524d87f (patch) | |
| tree | 71bf0730b78d686385c7a44696dcb21a5f08c8bf /fs/jffs2/erase.c | |
| parent | 8f9993f76aacfc58083fad04f8e1b6bbea33de23 (diff) | |
| parent | 00482a4078f4ff0dd0638e7f2fd83e34cc402ff7 (diff) | |
| download | blackbird-op-linux-b01ee53dda8bd81855b7cda0dfb7f27d1524d87f.tar.gz blackbird-op-linux-b01ee53dda8bd81855b7cda0dfb7f27d1524d87f.zip | |
Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
* 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: implement the standby function for pm/cpuidle
ARM: at91: remove wait_for_interrupt definition
ARM: at91: declare header name
ARM: at91: coding style fixes
Diffstat (limited to 'fs/jffs2/erase.c')
0 files changed, 0 insertions, 0 deletions
