linux-next: manual merge of the moduleh tree with the staging tree
From: Stephen Rothwell <hidden>
Date: 2011-10-06 05:31:39
Also in:
lkml
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/iio/adc/ad7314.c between commit 48a2c3799b71
("staging:iio:adc:ad7314 removal. Supported via hwmon") from the staging
tree and commit 09ff337cbb48 ("staging: Add module.h to drivers/staging
users") from the moduleh tree.
The former removes this file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 836 bytes