Prev: new ->perform_write fop
Next: linux-next: manual merge of the v4l-dvb tree with Linus' tree
From: Benjamin Herrenschmidt on 12 May 2010 21:50
Hi Linus !

I've added to my merge branch Kumar's swiotlb fix. Here's the updated
pull request.

Thanks !

Cheers,
Ben.

The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8:
Linus Torvalds (1):
Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Benjamin Herrenschmidt (1):
Merge commit 'kumar/merge' into merge

Kumar Gala (1):
powerpc/swiotlb: Fix off by one in determining boundary of which ops to use

Paul Mackerras (1):
powerpc/perf_event: Fix oops due to perf_event_do_pending call

arch/powerpc/include/asm/hw_irq.h | 38 -----------------------
arch/powerpc/kernel/asm-offsets.c | 1 -
arch/powerpc/kernel/dma-swiotlb.c | 5 ++-
arch/powerpc/kernel/entry_64.S | 9 -----
arch/powerpc/kernel/irq.c | 6 ----
arch/powerpc/kernel/time.c | 60 +++++++++++++++++++++++++++++-------
6 files changed, 51 insertions(+), 68 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: new ->perform_write fop
Next: linux-next: manual merge of the v4l-dvb tree with Linus' tree