summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-05 21:27:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-05 21:27:57 -0700
commitbfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (patch)
tree3eacbc74953999bc57137f04333bf94e7a052823 /fs
parenta1fde08c74e90accd62d4cfdbf580d2ede938fe7 (diff)
parent9baeb7e47aed8e399d15d2ea8c032efe3680f20b (diff)
downloadop-kernel-dev-bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0.zip
op-kernel-dev-bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0.tar.gz
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
* 'for-linus' of git://github.com/at91linux/linux-2.6-at91: at91: Add ARCH_ID and basic cpu macros definition for 5series chips family. arm: at91: fix compiler warning for eb01 board build arm: at91: minimal defconfig for at91x40 SoC ARM: at91: AT91CAP9 has a macb device
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud