diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-09-04 08:33:03 -0400 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-09-04 08:33:03 -0400 |
| commit | 4fd23436f1f414fea9a1a6050d4ed6de02cb91e5 (patch) | |
| tree | 687485fbe97ce053af50b80871777d9f36f4e0c5 /drivers/pcmcia | |
| parent | 54cd3148a149f7413cc25cb832f42cf0dabcee29 (diff) | |
| parent | 266feefeb9ea2d846ac82eb6db1a54b230364ba4 (diff) | |
| parent | d8196a93b1ce9a5abb410f39f9375912c9e53675 (diff) | |
Merge branches 'smbus' and 'fujitsu-fix' into release-2.6.27