linux-next: manual merge of the trivial tree with the wireless tree

From: Stephen Rothwell
Date: Sun Apr 10 2011 - 23:29:06 EST

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/ath/ath9k/phy.h between commit a9b6b2569cf1
("ath9k_hw: turn a few big macros into functions") from the wireless tree
and commit 6eab04a87677 ("treewide: remove extra semicolons") from the
trivial tree.

The former commit removed the code that the latter changed, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature