summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-07-24 19:38:47 +0400
committerRoland Dreier <rolandd@cisco.com>2008-07-24 19:38:47 +0400
commit2cc177364e4746becdf421f926fb967c047ccc32 (patch)
tree189dca3793dae155d61fa960a35046f0334ed51a /include
parent2f5de1512884da8c74bec2c76e8f114b972ab4be (diff)
parent1a867c33bb65f2921351a9bdd98548bb96f0ff8c (diff)
parent1ca8d15619f725e223c19137350b0336b9196193 (diff)
parent76442640829163d0cdb67c2bf0cb4b81a0fe537b (diff)
parente8bb4beb2b1f90d499134f2849727ed04c3bedc4 (diff)
parent1fa6d8181b7bb0361512170c30e436dcc95591ee (diff)
downloadlinux-2cc177364e4746becdf421f926fb967c047ccc32.tar.xz
Merge branches 'bkl-removal', 'cma', 'ehca', 'for-2.6.27', 'mlx4', 'mthca' and 'nes' into for-linus