linux-next: manual merge of the powerpc tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
drivers/macintosh/mediabay.c between commit
7ad963b103d3863b1161c59f3e65a435979804ed ("ide-pmac: media-bay support
fixes (take 4)") from the ide tree and commit
9a24729d8aeef967eac7af71c6a69edc83d06558 ("macintosh/media bay: Convert
semaphore to mutex") from the powerpc tree.

I just applied the up/down -> mutex_unlock/mutex_lock change to the ide
tree version.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20080707/17bb4e3e/attachment.pgp>