summaryrefslogtreecommitdiff
path: root/fs/ncpfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-04 15:54:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-04 15:54:18 -0700
commitfc52693f8f54485af29be1adc90ce2bd54ad325f (patch)
tree95ffbab75003d6da6a516a8956734bb7e3e5cb62 /fs/ncpfs
parentaababb9766f0e874da26a17acbbec867bf9501f0 (diff)
parent64393b3ae4e3cc86e2d622f682d736ec973364b6 (diff)
Merge branch 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc
* 'at91/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-2.6-arm-soc: AT91: Change nand buswidth logic to match hardware default configuration at91: Use "pclk" as con_id on at91cap9 and at91rm9200 at91: fix udc, ehci and mmc clock device name for cap9/9g45/9rl atmel_serial: fix internal port num at91: fix at91_set_serial_console: use platform device id
Diffstat (limited to 'fs/ncpfs')
0 files changed, 0 insertions, 0 deletions