Wei Yang
74d24b219b
resources: add resource_overlaps() ...
Add resource_overlaps(), which returns true if two resources overlap at all.
Use this to replace the complicated check in coalesce_windows().
Signed-Off-By: Wei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
2012-05-07 10:58:57 -06:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
PCI: work around Stratus ftServer broken PCIe hierarchy
2012-04-30 15:21:02 -06:00
crypto: user - Fix lookup of algorithms with IV generator
2012-03-29 19:52:47 +08:00
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01:00
resources: add resource_overlaps()
2012-05-07 10:58:57 -06:00
The following text was taken from the original review request:
2012-03-24 10:41:37 -07:00
mac80211: Convert WARN_ON to WARN_ON_ONCE
2012-04-09 15:54:48 -04:00
Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next
2012-03-19 09:50:33 -07:00
SCSI: Fix error handling when no ULD is attached
2012-04-15 11:08:53 -07:00
ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
2012-04-10 14:53:55 +02:00
target: Use array_zalloc for device_list
2012-03-15 19:15:51 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-04 10:04:42 -07:00
Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm
2012-03-27 18:17:02 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
74d24b219b