tree 189dca3793dae155d61fa960a35046f0334ed51a
parent 2f5de1512884da8c74bec2c76e8f114b972ab4be
parent 1a867c33bb65f2921351a9bdd98548bb96f0ff8c
parent 1ca8d15619f725e223c19137350b0336b9196193
parent 76442640829163d0cdb67c2bf0cb4b81a0fe537b
parent e8bb4beb2b1f90d499134f2849727ed04c3bedc4
parent 1fa6d8181b7bb0361512170c30e436dcc95591ee
author Roland Dreier <rolandd@cisco.com> 1216913927 -0700
committer Roland Dreier <rolandd@cisco.com> 1216913927 -0700

Merge branches 'bkl-removal', 'cma', 'ehca', 'for-2.6.27', 'mlx4', 'mthca' and 'nes' into for-linus