summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds2010-11-01 12:53:19 +0100
committerLinus Torvalds2010-11-01 12:53:19 +0100
commitb3b2b6351a3f3342e6669b5c2defc85f6af75ee3 (patch)
tree9b47ae7b0111ab024d719214d2745b128db48beb /usr
parentMerge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 (diff)
parentCRIS: Add paths for CRISv10 serial driver (diff)
downloadkernel-qcow2-linux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.tar.gz
kernel-qcow2-linux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.tar.xz
kernel-qcow2-linux-b3b2b6351a3f3342e6669b5c2defc85f6af75ee3.zip
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: CRIS: Add paths for CRISv10 serial driver CRIS: Fix RS485 delay handling. Add missing "struct" to in sizeof.
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions