L1B to H1B cos - cap limit

I am on L1B for 3 years till date (As of Jan-2015) and planning to apply for H1B this year. If I get a fresh H1B, will that have a cap of 6 years? Or will the cap include L1B time period also?