diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-03 00:32:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-03-03 00:32:50 +0000 |
| commit | 16af43fef87512f7324205783526f543ddcf09cf (patch) | |
| tree | 28995abd8604d61ba84d97d28448ccccb91467c9 /drivers/misc/sgi-xp | |
| parent | 9664ffe6a16676fa4d6a238ad3d9bb6cc24825a1 (diff) | |
| parent | ded3ef0fa71696d3cf631fa4b8ac65313f370b4c (diff) | |
| parent | 653a761e4ba70bf12174dedcd5fbbf54f431abb3 (diff) | |
Merge branches 'devel-stable', 'fixes' and 'mmci' into for-linus