lp://qastaging/~phatforge/linux/powertop
- Get this branch:
- bzr branch lp://qastaging/~phatforge/linux/powertop
Branch merges
Recent revisions
- 37891. By Linus Torvalds <email address hidden>
-
Merge branch 'drm-fixes' of git://git.
kernel. org/pub/ scm/linux/ kernel/ git/airlied/ drm-2.6 * 'drm-fixes' of git://git.
kernel. org/pub/ scm/linux/ kernel/ git/airlied/ drm-2.6:
drm/radeon/kms: pll tweaks for r7xx
drm/nouveau: fix allocation of notifier object
drm/nouveau: fix notifier memory corruption bug
drm/nouveau: fix pinning of notifier block
drm/nouveau: populate ttm_alloced with false, when it's not
drm/nouveau: fix nv30 pcie boards
drm/nouveau: split ramin_lock into two locks, one hardirq safe
drm/radeon/kms: adjust evergreen display watermark setup
drm/radeon/kms: add connectors even if i2c fails
drm/radeon/kms: fix bad shift in atom iio table parser - 37890. By Linus Torvalds <email address hidden>
-
Merge git://git.
kernel. org/pub/ scm/linux/ kernel/ git/davem/ net-2.6 * git://git.
kernel. org/pub/ scm/linux/ kernel/ git/davem/ net-2.6: (51 commits)
netfilter: ipset: Fix the order of listing of sets
ip6_pol_route panic: Do not allow VLAN on loopback
bnx2x: Fix port identification problem
r8169: add Realtek as maintainer.
ip: ip_options_compile( ) resilient to NULL skb route
bna: fix memory leak during RX path cleanup
bna: fix for clean fw re-initialization
usbnet: Fix up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps.
iwlegacy: fix tx_power initialization
Revert "tcp: disallow bind() to reuse addr/port"
qlcnic: limit skb frags for non tso packet
net: can: mscan: fix build breakage in mpc5xxx_can
netfilter: ipset: set match and SET target fixes
netfilter: ipset: bitmap:ip,mac type requires "src" for MAC
sctp: fix oops while removed transport still using as retran path
sctp: fix oops when updating retransmit path with DEBUG on
net: Disable NETIF_F_TSO_ECN when TSO is disabled
net: Disable all TSO features when SG is disabled
sfc: Use rmb() to ensure reads occur in order
ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile
... - 37889. By Linus Torvalds <email address hidden>
-
Merge branch 'for-linus' of git://git.
kernel. org/pub/ scm/linux/ kernel/ git/jbarnes/ pci-2.6 * 'for-linus' of git://git.
kernel. org/pub/ scm/linux/ kernel/ git/jbarnes/ pci-2.6:
PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig - 37888. By Linus Torvalds <email address hidden>
-
Merge branch 'x86-fixes-
for-linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip * 'x86-fixes-
for-linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip:
x86, gart: Make sure GART does not map physmem above 1TB
x86, gart: Set DISTLBWALKPRB bit always
x86, gart: Convert spaces to tabs in enable_gart_translatio n - 37887. By Linus Torvalds <email address hidden>
-
Merge branch 'timer-
fixes-for- linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip * 'timer-
fixes-for- linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip:
RTC: rtc-omap: Fix a leak of the IRQ during init failure
posix clocks: Replace mutex with reader/writer semaphore - 37886. By Linus Torvalds <email address hidden>
-
Merge branch 'perf-fixes-
for-linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip * 'perf-fixes-
for-linus' of git://git. kernel. org/pub/ scm/linux/ kernel/ git/tip/ linux-2. 6-tip:
perf, x86: Fix AMD family 15h FPU event constraints
perf, x86: Fix pre-defined cache-misses event for AMD family 15h cpus
perf evsel: Fix use of inherit
perf hists browser: Fix seg fault when annotate null symbol - 37885. By Linus Torvalds <email address hidden>
-
Revert "[media] V4L: videobuf, don't use dma addr as physical"
This reverts commit 35d9f510b67b103
38161aba6229d4f 55b4000f5b. Quoth Jiri Slaby:
"It fixes mmap when IOMMU is used on x86 only, but breaks architectures
like ARM or PPC where virt_to_phys(dma_ alloc_coherent) doesn't work.
We need there dma_mmap_coherent or similar (the trickery what
snd_pcm_default_ mmap does but in some saner way). But this cannot be
done at this phase."Requested-by: Jiri Slaby <email address hidden>
Cc: Russell King - ARM Linux <email address hidden>
Cc: Janusz Krzysztofik <email address hidden>
Acked-by: Mauro Carvalho Chehab <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden> - 37884. By Linus Torvalds <email address hidden>
-
Merge git://git.
kernel. org/pub/ scm/linux/ kernel/ git/steve/ gfs2-2. 6-fixes * git://git.
kernel. org/pub/ scm/linux/ kernel/ git/steve/ gfs2-2. 6-fixes:
GFS2: filesystem hang caused by incorrect lock order
GFS2: Don't try to deallocate unlinked inodes when mounted ro
GFS2: directly write blocks past i_size
GFS2: write_end error path fails to unlock transaction lock - 37882. By Linus Torvalds <email address hidden>
-
Merge branch 'for-39-rc4' of git://codeauror
a.org/quic/ kernel/ davidb/ linux-msm * 'for-39-rc4' of git://codeauror
a.org/quic/ kernel/ davidb/ linux-msm:
msm: timer: fix missing return value
msm: Remove extraneous ffa device check
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/linux