aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-09-16 11:57:52 -0700
committerRoland Dreier <rolandd@cisco.com>2008-09-16 11:57:52 -0700
commit7e2c23285454ecc8c8159b86d6343efe222ca3ae (patch)
treed4bb840de3750e01f81a604b3e300e0c50597ee1
parente8224e4b804b4fd26723191c1891101a5959bb8a (diff)
parent29bdc88384c2b24e37e5760df0dc898546083d6b (diff)
parentd7ffd5076d4407d54b25bc4b25f3002f74fbafde (diff)
downloadlinux-linaro-android-7e2c23285454ecc8c8159b86d6343efe222ca3ae.tar.gz
Merge branches 'ipoib', 'mlx4' and 'nes' into for-linus