diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-07-26 13:59:47 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-07-26 13:59:47 -0700 |
| commit | cc9969c96765476db5e30c9e074a57838604c1d1 (patch) | |
| tree | 919c8528ca998f037afb8a512ba0f9c81e70069c /drivers/block/xd.h | |
| parent | 5ba18b186c979283a2bf75a28b7ea325184b0c08 (diff) | |
| parent | 9905922446f6dc02fd4650c8f59114d6bdb5b777 (diff) | |
| parent | 51a379d0c8f7a6db7c9e3c9c770d90a6d2d1ef9b (diff) | |
| parent | 6492cdf3a24fd620660c399745b5e169a0ed27d6 (diff) | |
Merge branches 'bkl-removal', 'ipoib', 'mlx4' and 'nes' into for-linus