From: Linus Torvalds Date: Mon, 1 Nov 2010 11:53:19 +0000 (-0400) Subject: Merge branch 'for-linus' of git://www.jni.nu/cris X-Git-Tag: v2.6.37-rc1~1 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b3b2b6351a3f3342e6669b5c2defc85f6af75ee3 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. --- b3b2b6351a3f3342e6669b5c2defc85f6af75ee3