| commit | 68ac01a2de5faed5e19a78c06314804c6184a650 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 16 16:48:36 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 16 16:48:36 2011 -0800 |
| tree | 44bc9d9bb40f2781519c0f4f608f6456bdbc0db6 | |
| parent | e51900f7d38cbcfb481d84567fd92540e7e1d23a [diff] | |
| parent | 0f3e1d27a7e3f98d996d707d649128e229b65deb [diff] |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 * 'spi/merge' of git://git.secretlab.ca/git/linux-2.6: spi/pxa2xx pci: fix the release - remove race