summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ixp4xx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-15 18:03:49 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-15 18:03:49 (GMT)
commitaf8a927c8bdea82cf220e0b720d64daaf073a969 (patch)
tree97411751db099ab0c2022d0699e6f9df9aef2e3a /arch/arm/mach-ixp4xx
parent3110df800c4de2724624d46e6bed27efc5e9a707 (diff)
parent3a36199114de0e60984534776732e0a7a220e29e (diff)
downloadlinux-af8a927c8bdea82cf220e0b720d64daaf073a969.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: remove resize from unsupported features list
Diffstat (limited to 'arch/arm/mach-ixp4xx')
0 files changed, 0 insertions, 0 deletions