Most likely the ones from before as they have a contract with atheros to supply the wireless chips for the macbooks, macbook pros, and imacs.
If apple decides to switch to intel wifi chips and there isnt really a reason they shouldnt, the macbook would become a centrino certified laptop because of motherboard, wireless chip, and graphics chip.
Macbook Pros come with the PM965 chipset which lacks Crestline graphics. Whenever the macbooks get updated to santa rosa it will come with the GM965 chipset which includes X3100.