diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-26 23:06:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-26 23:06:52 -0800 |
| commit | d1a8c54b704a4bcf62c0c109ec764277f0bcc57d (patch) | |
| tree | cebc0df6224f92f7e554b96bad2daf7e4fe13a64 /fs/nfs/nfs4filelayoutdev.c | |
| parent | dcd6c92267155e70a94b3927bce681ce74b80d1f (diff) | |
| parent | 14f991a730f453a1c8f114ccb686f83e158fdd92 (diff) | |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
* 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: Fix at91sam9g45 and at91cap9 reset
ARM: at91: make rstc soc independent
ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
ARM: at91: fix cap9 ddrsdr register
ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
USB: at91: fix clk_get error handling
ARM: at91: removal of CAP9 SoC family
ARM: at91: fix at91rm9200 soc subtype handling
Diffstat (limited to 'fs/nfs/nfs4filelayoutdev.c')
0 files changed, 0 insertions, 0 deletions