| commit | d26f0528d588e596955bf296a609afe52eafc099 | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sat Sep 19 02:14:45 2009 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sat Sep 19 02:14:45 2009 -0400 |
| tree | 314f7a5637d5517a19f29d64a17e3459505def8f | |
| parent | b963bd39c9000328f6ce4f12aa52abbb0c68ee91 [diff] | |
| parent | df43176c934f2bc01f7615a6e20a4b8e77dcdd11 [diff] |
Merge branch 'misc-2.6.32' into release Conflicts: drivers/pci/dmar.c Signed-off-by: Len Brown <len.brown@intel.com>