Prev: [GIT PULL v2 0/4] perf tools improvements and minor fixes
Next: [PATCH] 88pm860x_bl: fix error handling in pm860x_backlight_probe
From: Stephen Rothwell on 9 May 2010 21:30
Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ar9170/main.c between commit
984b3f5746ed2cde3d184651dabf26980f2b66e5 ("bitops: rename for_each_bit()
to for_each_set_bit()") from Linus' tree and commit
f3926b49b7122f66f8f2a1da4ae3275b112ab3e7 ("ar9170usb: remove deprecated
aggregation code") from the wireless tree.

The latter just remove the code modified by the former.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
 | 
Pages: 1
Prev: [GIT PULL v2 0/4] perf tools improvements and minor fixes
Next: [PATCH] 88pm860x_bl: fix error handling in pm860x_backlight_probe