diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-18 12:50:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-18 12:50:30 +1000 |
| commit | 1a540167e21383bf1b79e56bf87ec42ba3cb7ad3 (patch) | |
| tree | c94351e77f049775348b72d1ee0643d75b1daaee /drivers/platform/x86/panasonic-laptop.c | |
| parent | 96e48c9f1bbbdbfb0e75b1e856ef8f5062961c9e (diff) | |
| parent | f5afe0924f0b48eda150ea40d3f339fe1637797e (diff) | |
Merge remote-tracking branch 'drivers-x86/linux-next'
Conflicts:
drivers/platform/x86/intel_pmic_gpio.c
Diffstat (limited to 'drivers/platform/x86/panasonic-laptop.c')
0 files changed, 0 insertions, 0 deletions