board: Remove unused variables

Change-Id: I1929aa52d0f6b01944f6358b256b6ca1424dc54e
pm2: Fix offline charging for Samsung non-recovery kernels

Change-Id: I2c3e3820d84a52e84c5e54f305b3133f2bd7f657
Merge remote-tracking branch 'androidarmv6/cm-10.1' into ics