On Wed, 2012-06-06 at 15:27 +0200, Johannes Berg wrote: > Hi John, > > The following changes since commit fdbfff73408f99799724f583cbc2a0ce3263c6a7: > > net/wireless: ipw2200: introduce ipw_read_eeprom function (2012-06-05 17:15:49 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git for-john > > for you to fetch changes up to b1abedada3fd0aa100723aa9b60b7e31c17945cb: > > iwlwifi: remove extern opmode ops declarations (2012-06-06 13:26:00 +0200) > > > > Unfortunately, conflict resolution between this and wireless.git is > tricky -- not the conflicts, but what doesn't conflict: > .eeprom_params = &iwl6000_eeprom_params, > needs to be added to IWL_DEVICE_6035 in pcie/6000.c. How do you want to > handle that? This is my resolution: http://p.sipsolutions.net/4900c9143e20ef10.txt (in 3-way format) johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
