]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'pm-genirq' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 18:46:13 +0000 (20:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Sep 2014 18:46:13 +0000 (20:46 +0200)
1  2 
kernel/irq/chip.c

Simple merge