diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:11:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:11:16 +0200 |
| commit | 1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0 (patch) | |
| tree | eb03e3531bab2044681a9f16bd19f4550a4b8cf6 /fs/nfsd/nfs4state.c | |
| parent | d0b1a03704820d7e6ebff35237ac0968303f05a2 (diff) | |
| parent | de639854441af37fc88a72daab5842045d518944 (diff) | |
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
From Roland Stigge <stigge@antcom.de>:
this is a late addition to LPC32xx DTS files for v3.6.
* 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Add PWM to base dts file
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
0 files changed, 0 insertions, 0 deletions