diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-12 21:28:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-12 21:28:05 +0100 |
| commit | 4675348e78fab420e70f9144b320d9c063c7cee8 (patch) | |
| tree | d062e11199ad0eddc161c26b991d32ecdc96d2cf /drivers/power/max17040_battery.c | |
| parent | Merge tag 'regulator-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ia64/xen: Remove Xen support for ia64 even more (diff) | |
| download | linux-4675348e78fab420e70f9144b320d9c063c7cee8.tar.xz linux-4675348e78fab420e70f9144b320d9c063c7cee8.zip | |
Merge tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull Xen bugfixes from Konrad Rzeszutek Wilk:
"This has an healthy amount of code being removed - which we do not use
anymore (the only user of it was ia64 Xen which had been removed
already). The other bug-fixes are to make Xen ARM be able to use the
new event channel mechanism and proper export of header files to
user-space.
Summary:
- Fix ARM and Xen FIFO not working.
- Remove more Xen ia64 vestigates.
- Fix UAPI missing Xen files"
* tag 'stable/for-linus-3.14-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
ia64/xen: Remove Xen support for ia64 even more
xen: install xen/gntdev.h and xen/gntalloc.h
xen/events: bind all new interdomain events to VCPU0
Diffstat (limited to 'drivers/power/max17040_battery.c')
0 files changed, 0 insertions, 0 deletions