diff options
| author |   Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (patch) | |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 /net/unix/af_unix.c | |
| parent | Merge branch 'cpuidle' into test (diff) | |
| parent | Subject: ACPI dock: Use ACPI_EXCEPTION instead of printk(KERN_ERR (diff) | |
| download | wireguard-linux-47bf31adc541bef0c20de15e800e0011f1ae70c7.tar.xz wireguard-linux-47bf31adc541bef0c20de15e800e0011f1ae70c7.zip | |
Merge branch 'dock' into test
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions