summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-10-24 00:44:36 +0400
committerJiri Kosina <jkosina@suse.cz>2010-10-24 00:44:36 +0400
commitc3d9d74336c10c133ed062a1d778d457c6a46422 (patch)
tree3763bf5b68feca1088c5a87c6bdb23b14c42b736
parent35da7a307c535f9c2929cae277f3df425c9f9b1e (diff)
parent569b10a506c4d5bc7398d040930539d84d3a2186 (diff)
parentcb174681a9ececa6702f114b85bdf82144b6a5af (diff)
downloadlinux-c3d9d74336c10c133ed062a1d778d457c6a46422.tar.xz
Merge branches 'upstream' and 'upstream-fixes' into for-linus