Benjamin Herrenschmidt 87fa35dd88 powerpc/hvsi: Fix conflict with old HVSI driver ...

A mix of think & mismerge on my side caused a problem where both the
new hvsi_lib and the old hvsi driver gets compiled and try to define
symbols with the same name.

This fixes it by renaming the hvsi_lib exported symbols.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2011-07-01 13:10:21 +10:00

..

accessibility

…

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-05-29 11:19:16 -07:00

amba

…

ata

ahci: change 'masking port_map' printk to KERN_WARNING level

2011-06-29 10:10:07 -07:00

atm

…

auxdisplay

…

base

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2011-06-28 11:15:36 -07:00

bcma

…

block

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

2011-06-04 08:11:26 +09:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem

2011-06-17 12:40:36 -04:00

cdrom

block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal

2011-06-02 05:29:19 +09:00

char

drivers/char/hpet.c: fix periodic-emulation for delayed interrupts

2011-06-15 20:04:02 -07:00

clk

…

clocksource

Revert "clocksource: sh_cmt: Runtime PM support"

2011-05-31 15:26:42 +09:00

connector

Connector: Correctly set the error code in case of success when dispatching receive callbacks

2011-06-07 12:02:00 -07:00

cpufreq

[CPUFREQ] powernow-k8: Don't try to transition if the pstate is incorrect

2011-06-16 16:31:13 -04:00

cpuidle

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

2011-05-29 11:18:09 -07:00

crypto

crypto: caam - fix operator precedence in shared descriptor allocation

2011-06-30 07:43:27 +08:00

dca

…

dio

…

dma

dmaengine: shdma: SH_DMAC_MAX_CHANNELS message fix

2011-06-14 15:03:07 +09:00

edac

…

eisa

…

firewire

…

firmware

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2011-06-28 11:15:36 -07:00

gpio

gpio/omap4: Fix missing interrupts during device wakeup due to IOPAD.

2011-06-16 08:40:43 -06:00

gpu

drm/radeon/kms: increase rom size for atrm method

2011-06-30 10:12:17 +10:00

hid

HID: hid-multitouch: add support for a new Lumio dual-touch panel

2011-06-24 13:41:11 +02:00

hwmon

hwmon: (s3c) Initialize sysfs attributes

2011-06-17 23:22:27 -07:00

hwspinlock

…

i2c

i2c/pca954x: Initialize the mux to disconnected state

2011-06-29 11:36:11 +02:00

ide

ide-cd: signedness warning fix again

2011-06-11 15:06:48 -07:00

idle

…

ieee802154

…

infiniband

Merge branches 'cxgb4' and 'qib' into for-next

2011-06-17 11:57:55 -07:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2011-06-20 08:59:46 -07:00

isdn

gigaset: call module_put before restart of if_open()

2011-06-17 15:27:32 -04:00

leds

drivers/leds/leds-lp5523.c: fix section mismatches

2011-06-27 18:00:13 -07:00

lguest

…

macintosh

…

mca

…

md

md: avoid endless recovery loop when waiting for fail device to complete.

2011-06-28 16:59:42 +10:00

media

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

2011-06-09 13:09:07 -07:00

memstick

…

message

…

mfd

…

misc

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2011-06-28 11:15:36 -07:00

mmc

mmc: queue: bring discard_granularity/alignment into line with SCSI

2011-06-25 18:53:05 -04:00

mtd

powerpc/85xx: fix NAND_CMD_READID read bytes number

2011-06-22 06:08:48 -05:00

net

pxa168_eth: fix race in transmit path.

2011-06-20 14:02:07 -07:00

nfc

…

nubus

…

of

…

oprofile

oprofile: Fix locking dependency in sync_start()

2011-05-31 16:33:34 +02:00

parisc

…

parport

…

pci

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2011-06-27 14:55:43 -07:00

pcmcia

gpio: include linux/gpio.h where needed

2011-06-16 08:40:44 -06:00

platform

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

2011-05-29 11:44:33 -07:00

pnp

…

power

…

pps

…

ps3

…

ptp

ptp: Fix some locking bugs in ptp_read()

2011-06-01 19:29:10 -07:00

rapidio

…

regulator

…

rtc

drivers/rtc/rtc-ds1307.c: add support for RTC device pt7c4338

2011-06-27 18:00:12 -07:00

s390

[S390] qdio: Split SBAL entry flags

2011-06-06 14:14:56 +02:00

sbus

…

scsi

[SCSI] Fix oops caused by queue refcounting failure

2011-06-02 18:34:43 +09:00

sfi

…

sh

drivers: sh: resume enabled clocks fix

2011-06-14 15:15:25 +09:00

sn

…

spi

spi/bfin_spi: fix handling of default bits per word setting

2011-06-17 08:27:27 -06:00

ssb

ssb: fix PCI(e) driver regression causing oops on PCI cards

2011-06-03 14:19:49 -04:00

staging

Staging: comedi: fix build breakages on some platforms

2011-06-27 14:43:34 -07:00

target

tcm_fc: Fix conversion spec warning

2011-06-24 00:09:16 +00:00

tc

…

telephony

…

thermal

…

tty

powerpc/hvsi: Fix conflict with old HVSI driver

2011-07-01 13:10:21 +10:00

uio

…

usb

Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

2011-06-28 11:15:17 -07:00

uwb

…

vhost

vhost: support event index

2011-05-30 11:14:15 +09:30

video

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x

2011-06-16 09:45:47 -07:00

virtio

virtio: add api for delayed callbacks

2011-05-30 11:14:16 +09:30

vlynq

…

w1

w1: W1_MASTER_DS1WM should depend on GENERIC_HARDIRQS

2011-06-15 20:04:00 -07:00

watchdog

…

xen

Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2011-06-20 09:01:33 -07:00

zorro

…

Kconfig

…

Makefile

…