Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits. 2be19102: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo() 765af22d: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change Scheduled NUMA init 32/64bit unification changes depend on these. Signed-off-by:Tejun Heo <tj@kernel.org>
No related branches found
No related tags found
Showing
- CREDITS 3 additions, 3 deletionsCREDITS
- Documentation/ABI/testing/sysfs-bus-css 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-bus-css
- Documentation/ABI/testing/sysfs-class-led 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-class-led
- Documentation/DocBook/dvb/dvbproperty.xml 1 addition, 1 deletionDocumentation/DocBook/dvb/dvbproperty.xml
- Documentation/DocBook/dvb/frontend.xml 1 addition, 1 deletionDocumentation/DocBook/dvb/frontend.xml
- Documentation/DocBook/kernel-locking.tmpl 1 addition, 1 deletionDocumentation/DocBook/kernel-locking.tmpl
- Documentation/DocBook/libata.tmpl 5 additions, 5 deletionsDocumentation/DocBook/libata.tmpl
- Documentation/DocBook/media-entities.tmpl 1 addition, 0 deletionsDocumentation/DocBook/media-entities.tmpl
- Documentation/DocBook/mtdnand.tmpl 6 additions, 6 deletionsDocumentation/DocBook/mtdnand.tmpl
- Documentation/DocBook/regulator.tmpl 2 additions, 2 deletionsDocumentation/DocBook/regulator.tmpl
- Documentation/DocBook/uio-howto.tmpl 1 addition, 1 deletionDocumentation/DocBook/uio-howto.tmpl
- Documentation/DocBook/usb.tmpl 1 addition, 1 deletionDocumentation/DocBook/usb.tmpl
- Documentation/DocBook/v4l/common.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/common.xml
- Documentation/DocBook/v4l/controls.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/controls.xml
- Documentation/DocBook/v4l/dev-subdev.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/dev-subdev.xml
- Documentation/DocBook/v4l/libv4l.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/libv4l.xml
- Documentation/DocBook/v4l/media-ioc-setup-link.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/media-ioc-setup-link.xml
- Documentation/DocBook/v4l/pixfmt-y12.xml 79 additions, 0 deletionsDocumentation/DocBook/v4l/pixfmt-y12.xml
- Documentation/DocBook/v4l/pixfmt.xml 1 addition, 0 deletionsDocumentation/DocBook/v4l/pixfmt.xml
- Documentation/DocBook/v4l/remote_controllers.xml 1 addition, 1 deletionDocumentation/DocBook/v4l/remote_controllers.xml
Loading
Please register or sign in to comment