diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-15 03:30:00 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-08-15 03:30:00 +0200 |
| commit | 0f2456236459f3ddef48a8a75d10b2d6ecf1a93d (patch) | |
| tree | d6981040c4cbb76c20d5a2222693f26513e7e808 /include/asm-alpha/parport.h | |
| parent | 3c7db22a194d3b53584047425af82b4e1e03d9f7 (diff) | |
| parent | 9d699ed92a459cb408e2577e8bbeabc8ec3989e1 (diff) | |
| parent | afd7301ddb762b66bf1831b0820b402e5d2c439d (diff) | |
| parent | fa46d3526461e8aa7c0fb39cc1b98ac656695a43 (diff) | |
| parent | 9f497bcc695fb828da023d74ad3c966b1e58ad21 (diff) | |
| parent | 5c742b45dd5fbbb6cf74d3378341704f4b23c5e8 (diff) | |
| parent | d0057413a7a277e104cf315faa1b55b60b4a5482 (diff) | |
Merge branches 'acpica-release-fixes', 'ec-fix', 'dock', 'irq-bounds', 'thermal-fix', 'wmi' and 'acpi-cleanups' into release-2.6.27