linux-next: manual merge of the trivial tree with the net tree
From: Stephen Rothwell <hidden>
Date: 2011-01-04 03:22:42
Also in:
linux-next, lkml
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-core.c between commit
81baf6ec9c190ae128748cf2a026bff5cb811b70 ("iwlwifi: Legacy isr only used
by legacy devices") from the net tree and commit
62e45c14fb9a978dca6c7a5dc8372cc8ea2f42c8 ("wireless: comment typo fix
diable -> disable") from the trivial tree.
The former moves the code modified by the latter to
drivers/net/wireless/iwlwifi/iwl-legacy.c. I didn't bother refixing the
typo there.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 490 bytes