linux-next: manual merge of the driver-core tree with the tree
From: Stephen Rothwell
Date: Fri Feb 15 2013 - 00:01:41 EST
Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/wireless/rtlwifi/Kconfig between commit 06e7cda3ce30
("rtlwifi: Rework Kconfig") from the wireless-next tree and commit
6cba014857f4 ("drivers/net/wireless/rtlwifi: remove depends on
CONFIG_EXPERIMENTAL") from the driver-core tree.
I fixed it up (the former is a superset of the latter, so I used that)
and can carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature