* Gustavo Padovan <gustavo@xxxxxxxxxxx> [2012-05-16 16:24:31 -0300]: > > What did you do here? I thought that maybe you had pulled from the > > wireless tree, but the commit ID is different. > > I did pull from there, actually bluetooth tree, but they have the same head > now. Something went wrong in the process of re-doing the tree. Sorry for waste > you time here, John. > > I did a correct merge now, the hashs are the same in bluetooth-next: > > 671267b Bluetooth: mgmt: Fix device_connected sending order > a7d7723 Bluetooth: notify userspace of security level change > 574e02a rtlwifi: fix for race condition when firmware is cached > > and in wireless: > > 671267b Bluetooth: mgmt: Fix device_connected sending order > a7d7723 Bluetooth: notify userspace of security level change > 574e02a rtlwifi: fix for race condition when firmware is cached > > Gustavo > > --- > > The following changes since commit 341352d13dae752610342923c53ebe461624ee2c: > > iwlwifi: fix-up some merge damage from commit 0d6c4a2 (2012-05-08 22:18:09 -0400) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next for-upstream > > for you to fetch changes up to 48af33a8ff98515915fb40021de91066f2a45d49: I applied a last minute patch and then realized it was wrong. Just removed it, the new head is: d839c81372d1f0caee47f87b26a68e91d4ff3847 Gustavo -- 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
